diff -Nru openvswitch-2.4.0/acinclude.m4 openvswitch-2.4.1/acinclude.m4 --- openvswitch-2.4.0/acinclude.m4 2015-08-20 16:51:36.258995254 +0000 +++ openvswitch-2.4.1/acinclude.m4 2016-03-22 13:09:54.390615117 +0000 @@ -322,12 +322,15 @@ OVS_GREP_IFELSE([$KSRC/include/linux/etherdevice.h], [ether_addr_copy]) OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [vlan_set_encap_proto]) + OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [vlan_hwaccel_push_inside]) OVS_GREP_IFELSE([$KSRC/include/linux/in.h], [ipv4_is_multicast]) + OVS_GREP_IFELSE([$KSRC/include/linux/in.h], [proto_ports_offset]) OVS_GREP_IFELSE([$KSRC/include/net/ip.h], [__ip_select_ident.*dst_entry], [OVS_DEFINE([HAVE_IP_SELECT_IDENT_USING_DST_ENTRY])]) OVS_GREP_IFELSE([$KSRC/include/net/ip.h], [inet_get_local_port_range.*net], [OVS_DEFINE([HAVE_INET_GET_LOCAL_PORT_RANGE_USING_NET])]) + OVS_GREP_IFELSE([$KSRC/include/net/ip.h], [ip_is_fragment]) OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_disable_lro]) OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_get_stats]) @@ -336,6 +339,10 @@ OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [can_checksum_protocol]) OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [netdev_features_t]) OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [pcpu_sw_netstats]) + OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [netdev_rx_handler_register]) + OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [net_device_extended]) + OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [rx_handler_func_t.*pskb], + [OVS_DEFINE([HAVE_RX_HANDLER_PSKB])]) OVS_GREP_IFELSE([$KSRC/include/linux/netfilter.h], [nf_hookfn.*nf_hook_ops], [OVS_DEFINE([HAVE_NF_HOOKFN_ARG_OPS])]) @@ -353,6 +360,7 @@ # quoting rules. OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [[[^@]]proto_data_valid], [OVS_DEFINE([HAVE_PROTO_DATA_VALID])]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_checksum_start_offset]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [kfree_skb_list]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [rxhash]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [u16.*rxhash], @@ -381,7 +389,8 @@ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_clear_hash]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [int.skb_zerocopy(], [OVS_DEFINE([HAVE_SKB_ZEROCOPY])]) - OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [l4_rxhash]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [u8.*l4_rxhash], + [OVS_DEFINE([HAVE_L4_RXHASH])]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_ensure_writable]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_vlan_pop]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_vlan_push]) @@ -417,6 +426,8 @@ OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [nla_put_be64]) OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [nla_find_nested]) OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [nla_is_last]) + OVS_GREP_IFELSE([$KSRC/include/linux/netlink.h], [void.*netlink_set_err], + [OVS_DEFINE([HAVE_VOID_NETLINK_SET_ERR])]) OVS_GREP_IFELSE([$KSRC/include/net/sctp/checksum.h], [sctp_compute_cksum]) @@ -446,6 +457,9 @@ OVS_GREP_IFELSE([$KSRC/include/uapi/linux/netdevice.h], [NET_NAME_UNKNOWN], [OVS_DEFINE([HAVE_NET_NAME_UNKNOWN])]) + OVS_GREP_IFELSE([$KSRC/include/linux/utsrelease.h], [el6], + [OVS_DEFINE([HAVE_RHEL6_PER_CPU])]) + if cmp -s datapath/linux/kcompat.h.new \ datapath/linux/kcompat.h >/dev/null 2>&1; then rm datapath/linux/kcompat.h.new diff -Nru openvswitch-2.4.0/aclocal.m4 openvswitch-2.4.1/aclocal.m4 --- openvswitch-2.4.0/aclocal.m4 2015-08-21 17:00:50.755248766 +0000 +++ openvswitch-2.4.1/aclocal.m4 2016-03-22 13:10:59.268208521 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,16 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,22 +51,22 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -84,7 +85,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -110,22 +111,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -144,16 +142,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -163,7 +159,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -176,12 +172,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -189,8 +186,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -229,16 +227,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -247,16 +245,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -304,7 +302,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -314,34 +312,39 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -354,7 +357,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -366,21 +369,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -398,7 +399,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -408,18 +409,21 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -432,7 +436,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -461,31 +465,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -496,34 +509,78 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -545,7 +602,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -564,16 +621,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -589,14 +644,12 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -614,7 +667,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -639,52 +692,14 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -692,11 +707,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -709,63 +723,35 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -776,7 +762,54 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -795,22 +828,16 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -821,32 +848,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -856,36 +891,85 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -893,34 +977,32 @@ # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -928,24 +1010,22 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -955,75 +1035,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff -Nru openvswitch-2.4.0/AUTHORS openvswitch-2.4.1/AUTHORS --- openvswitch-2.4.0/AUTHORS 2015-08-21 00:18:20.846479290 +0000 +++ openvswitch-2.4.1/AUTHORS 2016-03-22 13:09:54.382614864 +0000 @@ -76,6 +76,7 @@ Helmut Schaa helmut.schaa@googlemail.com Huanle Han hanxueluo@gmail.com Ian Campbell Ian.Campbell@citrix.com +Ian Stokes ian.stokes@intel.com Isaku Yamahata yamahata@valinux.co.jp James P. roampune@gmail.com James Page james.page@ubuntu.com @@ -103,6 +104,7 @@ Kyle Mestery mestery@mestery.com Kyle Upton kupton@baymicrosystems.com Lars Kellogg-Stedman lars@redhat.com +Lei Huang huang.f.lei@gmail.com Leo Alterman lalterman@nicira.com Lilijun jerry.lilijun@huawei.com Linda Sun lsun@vmware.com @@ -153,6 +155,7 @@ Sajjad Lateef slateef@nicira.com Samuel Ghinet sghinet@cloudbasesolutions.com Sanjay Sane ssane@nicira.com +Saurabh Mohan saurabh@cplanenetworks.com Saurabh Shah ssaurabh@nicira.com Scott Lowe scott.lowe@scottlowe.org Scott Mann sdmnix@gmail.com @@ -187,12 +190,15 @@ William Fulton YAMAMOTO Takashi yamamoto@midokura.com Yasuhito Takamiya yasuhito@gmail.com -yinpeijun yinpeijun@huawei.com Yu Zhiguo yuzg@cn.fujitsu.com +Yuanhan Liu yuanhan.liu@linux.intel.com ZhengLingyun konghuarukhr@163.com +Zoltán Balogh zoltan.balogh@ericsson.com Zoltan Kiss zoltan.kiss@citrix.com Zhi Yong Wu zwu.kernel@gmail.com Zang MingJie zealot0630@gmail.com +xushengping shengping.xu@huawei.com +yinpeijun yinpeijun@huawei.com The following additional people are mentioned in commit logs as having provided helpful bug reports or suggestions. @@ -255,6 +261,7 @@ Gordon Good ggood@nicira.com Greg Dahlman gdahlman@hotmail.com Gregor Schaffrath grsch@net.t-labs.tu-berlin.de +Gregory Smith gasmith@nutanix.com Guolin Yang gyang@vmware.com Gur Stavi gstavi@mrv.com Hari Sasank Bhamidipalli hbhamidi@cisco.com @@ -265,7 +272,6 @@ Hiroshi Tanaka htanaka@nicira.com Hiroshi Miyata miyahiro.dazu@gmail.com Hyojoon Kim joonk@gatech.edu -Ian Stokes ian.stokes@intel.com Igor Ganichev iganichev@nicira.com Igor Sever igor@xorops.com Jacob Cherkas jcherkas@nicira.com @@ -275,6 +281,7 @@ Jan Medved jmedved@juniper.net Janis Hamme janis.hamme@student.kit.edu Jari Sundell sundell.software@gmail.com +Javier Albornz javier.albornoz@hpe.com Jed Daniels openvswitch@jeddaniels.com Jeff Merrick jmerrick@vmware.com Jeongkeun Lee jklee@hp.com @@ -297,6 +304,7 @@ Logan Rosen logatronico@gmail.com Luca Falavigna dktrkranz@debian.org Luiz Henrique Ozaki luiz.ozaki@gmail.com +Manpreet Singh er.manpreet25@gmail.com Marco d'Itri md@Linux.IT Martin Vizvary vizvary@ics.muni.cz Marvin Pascual marvin@pascual.com.ph @@ -310,14 +318,17 @@ Mihir Gangar gangarm@vmware.com Mike Bursell mike.bursell@citrix.com Mike Kruze mkruze@nicira.com +Mike Qing mqing@vmware.com Min Chen ustcer.tonychan@gmail.com Mikael Doverhag mdoverhag@nicira.com Mrinmoy Das mrdas@ixiacom.com +Murali R muralirdev@gmail.com Nagi Reddy Jonnala njonnala@Brocade.com Niels van Adrichem N.L.M.vanAdrichem@tudelft.nl Niklas Andersson nandersson@nicira.com Pankaj Thakkar thakkar@nicira.com Pasi Kärkkäinen pasik@iki.fi +Patrik Andersson R patrik.r.andersson@ericsson.com Paulo Cravero pcravero@as2594.net Pawan Shukla shuklap@vmware.com Peter Amidon peter@picnicpark.org @@ -328,6 +339,8 @@ Ralf Heiringhoff ralf@frosty-geek.net Ram Jothikumar rjothikumar@nicira.com Ramana Reddy gtvrreddy@gmail.com +Ray Li rayli1107@gmail.com +RishiRaj Maulick rishi.raj2509@gmail.com Rob Sherwood rob.sherwood@bigswitch.com Robert Strickler anomalyst@gmail.com Roger Leigh rleigh@codelibre.net @@ -356,6 +369,7 @@ Thomas Morin thomas.morin@orange.com Timothy Chen tchen@nicira.com Torbjorn Tornkvist kruskakli@gmail.com +Tytus Kurek Tytus.Kurek@pega.com Valentin Bud valentin@hackaserver.com Vasiliy Tolstov v.tolstov@selfip.ru Vasu Dasari vdasari@gmail.com @@ -372,7 +386,10 @@ chen zhang 3zhangchen9211@gmail.com kk yap yapkke@stanford.edu likunyun kunyunli@hotmail.com +meishengxin meishengxin@huawei.com +neeraj mehta mehtaneeraj07@gmail.com rahim entezari rahim.entezari@gmail.com +weizj 34965317@qq.com 冯全树(Crab) fqs888@126.com 胡靖飞 hujingfei914@msn.com 张伟 zhangwqh@126.com diff -Nru openvswitch-2.4.0/build-aux/compile openvswitch-2.4.1/build-aux/compile --- openvswitch-2.4.0/build-aux/compile 2015-08-21 17:00:52.311248724 +0000 +++ openvswitch-2.4.1/build-aux/compile 2016-03-22 12:54:34.116012344 +0000 @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,224 @@ # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -53,11 +255,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +270,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +298,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +310,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -Nru openvswitch-2.4.0/build-aux/config.guess openvswitch-2.4.1/build-aux/config.guess --- openvswitch-2.4.0/build-aux/config.guess 2015-08-21 17:00:52.315248724 +0000 +++ openvswitch-2.4.1/build-aux/config.guess 2016-03-22 12:54:34.120012441 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2011-05-11' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,26 +15,22 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -140,12 +132,33 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -202,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -304,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -792,21 +809,26 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -852,15 +874,22 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -872,56 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -940,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1191,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1217,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1246,7 +1287,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1315,11 +1356,11 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -75,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -125,13 +116,17 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -154,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -223,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -247,20 +248,27 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -278,20 +286,21 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -300,7 +309,7 @@ | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +324,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -329,7 +337,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -352,25 +363,30 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -388,19 +404,20 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -408,10 +425,11 @@ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -711,7 +729,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -769,11 +786,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -808,10 +829,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i686-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -992,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1120,13 +1153,8 @@ basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1324,21 +1352,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1470,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1521,6 +1546,12 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; @@ -1548,9 +1579,6 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout @@ -1564,6 +1592,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru openvswitch-2.4.0/build-aux/depcomp openvswitch-2.4.1/build-aux/depcomp --- openvswitch-2.4.0/build-aux/depcomp 2015-08-21 17:00:52.639248717 +0000 +++ openvswitch-2.4.1/build-aux/depcomp 2016-03-22 12:54:34.320017354 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # 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 @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,11 +39,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,66 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,18 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -114,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -123,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -137,31 +216,31 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -179,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -188,43 +266,41 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -237,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -248,44 +322,100 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -297,8 +427,8 @@ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -309,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -322,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -333,77 +461,107 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; #nosideeffect) # This comment above is used by automake to tell side-effect @@ -422,7 +580,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,18 +600,18 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -503,12 +661,15 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -525,7 +686,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -544,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -579,23 +740,23 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru openvswitch-2.4.0/build-aux/dist-docs openvswitch-2.4.1/build-aux/dist-docs --- openvswitch-2.4.0/build-aux/dist-docs 2015-08-11 20:38:17.319288508 +0000 +++ openvswitch-2.4.1/build-aux/dist-docs 2016-03-22 13:09:54.390615117 +0000 @@ -103,9 +103,9 @@ (cd $distdir for manpage in $manpages; do man -l -Tps $manpage | ps2pdf - > $manpage.pdf - man -l -Tutf8 $manpage | sed 's/.//g' > $manpage.txt + GROFF_NO_SGR=1 man -l -Tutf8 $manpage | sed 's/.//g' > $manpage.txt (echo '
'
-      man -l -Tutf8 $manpage | sed '
+      GROFF_NO_SGR=1 man -l -Tutf8 $manpage | sed '
 s/&/&/g
 s//>/g
diff -Nru openvswitch-2.4.0/build-aux/install-sh openvswitch-2.4.1/build-aux/install-sh
--- openvswitch-2.4.0/build-aux/install-sh	2015-08-21 17:00:52.319248725 +0000
+++ openvswitch-2.4.1/build-aux/install-sh	2016-03-22 12:54:34.128012639 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +202,17 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -347,7 +354,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff -Nru openvswitch-2.4.0/build-aux/ltmain.sh openvswitch-2.4.1/build-aux/ltmain.sh
--- openvswitch-2.4.0/build-aux/ltmain.sh	2015-08-21 17:00:48.999248809 +0000
+++ openvswitch-2.4.1/build-aux/ltmain.sh	2016-03-22 12:54:30.043912329 +0000
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit , 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4 Debian-2.4-2ubuntu1
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4 Debian-2.4-2ubuntu1"
+VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6150,7 +6163,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6834,7 +6848,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7319,6 +7333,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7438,7 +7453,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8026,6 +8041,11 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8056,7 +8076,7 @@
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8064,11 +8084,7 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9158,6 +9174,8 @@
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9267,7 +9285,8 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff -Nru openvswitch-2.4.0/build-aux/missing openvswitch-2.4.1/build-aux/missing
--- openvswitch-2.4.0/build-aux/missing	2015-08-21 17:00:52.331248725 +0000
+++ openvswitch-2.4.1/build-aux/missing	2016-03-22 12:54:34.132012736 +0000
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard , 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard , 1996.
 
 # 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
@@ -26,69 +25,40 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to ."
     exit $?
@@ -100,272 +70,141 @@
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
 
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
 
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff -Nru openvswitch-2.4.0/config.h.in openvswitch-2.4.1/config.h.in
--- openvswitch-2.4.0/config.h.in	2015-08-21 17:00:52.019248733 +0000
+++ openvswitch-2.4.1/config.h.in	2016-03-22 13:11:12.240527133 +0000
@@ -175,9 +175,6 @@
    */
 #undef LT_OBJDIR
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Name of package */
 #undef PACKAGE
 
@@ -251,6 +248,11 @@
 # endif
 #endif
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
diff -Nru openvswitch-2.4.0/configure openvswitch-2.4.1/configure
--- openvswitch-2.4.0/configure	2015-08-21 17:00:51.403248748 +0000
+++ openvswitch-2.4.1/configure	2016-03-22 13:11:00.648242416 +0000
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for openvswitch 2.4.0.
+# Generated by GNU Autoconf 2.69 for openvswitch 2.4.1.
 #
 # Report bugs to .
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -339,6 +367,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -460,6 +496,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -494,16 +534,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -515,28 +555,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -570,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='openvswitch'
 PACKAGE_TARNAME='openvswitch'
-PACKAGE_VERSION='2.4.0'
-PACKAGE_STRING='openvswitch 2.4.0'
+PACKAGE_VERSION='2.4.1'
+PACKAGE_STRING='openvswitch 2.4.1'
 PACKAGE_BUGREPORT='bugs@openvswitch.org'
 PACKAGE_URL=''
 
@@ -617,8 +637,6 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
 OVS_LDFLAGS
 OVS_CFLAGS
 DPDK_NETDEV_FALSE
@@ -729,6 +747,7 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -742,6 +761,10 @@
 LDFLAGS
 CFLAGS
 CC
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -807,6 +830,7 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_dependency_tracking
 enable_largefile
 enable_shared
@@ -833,7 +857,6 @@
 with_l26
 with_l26_source
 with_dpdk
-enable_silent_rules
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1301,8 +1324,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1388,7 +1409,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures openvswitch 2.4.0 to adapt to many kinds of systems.
+\`configure' configures openvswitch 2.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1458,7 +1479,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of openvswitch 2.4.0:";;
+     short | recursive ) echo "Configuration of openvswitch 2.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1466,8 +1487,12 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --disable-largefile     omit support for large files
   --enable-shared[=PKGS]  build shared libraries [default=no]
   --enable-static[=PKGS]  build static libraries [default=yes]
@@ -1478,13 +1503,11 @@
   --enable-ndebug         Disable debugging features for max performance
   --disable-ssl           Disable OpenSSL support
   --enable-Werror         Add -Werror to CFLAGS
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1588,10 +1611,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-openvswitch configure 2.4.0
-generated by GNU Autoconf 2.68
+openvswitch configure 2.4.1
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1868,7 +1891,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2074,7 +2097,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2090,7 +2114,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2116,7 +2141,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2132,7 +2158,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2166,7 +2193,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2238,8 +2266,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by openvswitch $as_me 2.4.0, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by openvswitch $as_me 2.4.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2623,7 +2651,7 @@
 
 ac_config_commands="$ac_config_commands tests/atconfig"
 
-am__api_version='1.11'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2662,7 +2690,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2720,9 +2748,6 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -2733,32 +2758,40 @@
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -2770,6 +2803,16 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2792,12 +2835,12 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -2809,10 +2852,10 @@
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2831,7 +2874,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2871,7 +2914,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2922,7 +2965,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2951,12 +2994,6 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2975,7 +3012,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3039,6 +3076,45 @@
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -3061,7 +3137,7 @@
 
 # Define the identity of the package.
  PACKAGE='openvswitch'
- VERSION='2.4.0'
+ VERSION='2.4.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3089,93 +3165,107 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# 
+# 
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5
 $as_echo_n "checking how to create a pax tar archive... " >&6; }
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
-_am_tools=${am_cv_prog_tar_pax-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      { echo "$as_me:$LINENO: $_am_tar --version" >&5
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_pax-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        { echo "$as_me:$LINENO: $_am_tar --version" >&5
    ($_am_tar --version) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && break
-    done
-    am__tar="$_am_tar --format=posix -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=posix -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x pax -w "$$tardir"'
-    am__tar_='pax -L -x pax -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H pax -L'
-    am__tar_='find "$tardir" -print | cpio -o -H pax -L'
-    am__untar='cpio -i -H pax -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
+      done
+      am__tar="$_am_tar --format=posix -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=posix -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x pax -w "$$tardir"'
+      am__tar_='pax -L -x pax -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H pax -L'
+      am__tar_='find "$tardir" -print | cpio -o -H pax -L'
+      am__untar='cpio -i -H pax -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_pax}" && break
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_pax}" && break
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
    (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    { echo "$as_me:$LINENO: $am__untar &5
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      { echo "$as_me:$LINENO: $am__untar &5
    ($am__untar &5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
+      { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
+   (cat conftest.dir/file) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
 
-if ${am_cv_prog_tar_pax+:} false; then :
+  if ${am_cv_prog_tar_pax+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_prog_tar_pax=$_am_tool
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5
 $as_echo "$am_cv_prog_tar_pax" >&6; }
 
 
@@ -3183,6 +3273,48 @@
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: 
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: .
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -3202,7 +3334,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -3235,6 +3367,7 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3267,7 +3400,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3307,7 +3440,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3360,7 +3493,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3401,7 +3534,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3459,7 +3592,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3503,7 +3636,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3949,8 +4082,7 @@
 /* end confdefs.h.  */
 #include 
 #include 
-#include 
-#include 
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4035,6 +4167,65 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -4046,8 +4237,9 @@
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4081,16 +4273,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4099,16 +4291,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -4308,7 +4500,7 @@
   return 0;
 }
 _ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"; then :
@@ -4339,131 +4531,6 @@
 fi
 
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4619,7 +4686,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4685,7 +4752,7 @@
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+      as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -4752,7 +4819,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4820,7 +4887,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5012,8 +5079,8 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#	  define __EXTENSIONS__ 1
-	  $ac_includes_default
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
 int
 main ()
 {
@@ -5292,7 +5359,7 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5338,7 +5405,7 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5362,7 +5429,7 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5407,7 +5474,7 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5431,7 +5498,7 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5463,6 +5530,8 @@
 esac
 rm -rf conftest*
   fi
+
+
 fi
 
 
@@ -5474,8 +5543,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -5653,7 +5722,7 @@
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -5921,7 +5990,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5965,7 +6034,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6123,6 +6192,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -6149,7 +6223,8 @@
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -6162,7 +6237,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -6384,7 +6459,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6424,7 +6499,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6550,10 +6625,6 @@
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -6591,8 +6662,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -6730,7 +6801,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6770,7 +6841,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6873,7 +6944,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6917,7 +6988,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7042,7 +7113,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7082,7 +7153,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7141,7 +7212,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7181,7 +7252,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7231,13 +7302,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -7384,6 +7455,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -7672,7 +7744,7 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -7688,9 +7760,19 @@
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64le-*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -7709,7 +7791,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -7772,7 +7857,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -7783,7 +7868,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -7816,7 +7914,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7856,7 +7954,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7936,7 +8034,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7976,7 +8074,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8028,7 +8126,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8068,7 +8166,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8120,7 +8218,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8160,7 +8258,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8212,7 +8310,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8252,7 +8350,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8304,7 +8402,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8344,7 +8442,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8423,7 +8521,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -8434,6 +8538,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -8466,6 +8571,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -8487,7 +8593,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -8624,7 +8732,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -8702,6 +8825,10 @@
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -9161,7 +9288,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -9205,7 +9334,7 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -9252,18 +9381,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -9625,7 +9769,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -9878,8 +10021,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -10259,6 +10401,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -10304,6 +10447,7 @@
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -10332,10 +10476,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10348,7 +10488,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10387,7 +10527,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -11011,13 +11150,8 @@
 
 
 
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 if test "$GCC" = yes; then
   case $host_os in
@@ -11105,7 +11239,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -11114,7 +11248,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -11179,7 +11313,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -11318,7 +11452,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -11326,10 +11460,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -11337,7 +11467,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -11355,7 +11485,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -11374,19 +11504,8 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -11447,7 +11566,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -11463,7 +11582,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -11500,9 +11619,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11596,7 +11715,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -11665,7 +11784,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11690,7 +11809,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11714,7 +11833,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -11745,7 +11864,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11755,7 +11874,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12537,6 +12656,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -13138,7 +13259,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15813,6 +15934,35 @@
   fi
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vlan_hwaccel_push_inside matches in $KSRC/include/linux/if_vlan.h" >&5
+$as_echo_n "checking whether vlan_hwaccel_push_inside matches in $KSRC/include/linux/if_vlan.h... " >&6; }
+  if test -f $KSRC/include/linux/if_vlan.h; then
+    grep 'vlan_hwaccel_push_inside' $KSRC/include/linux/if_vlan.h >/dev/null 2>&1
+    status=$?
+    case $status in
+      0)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  echo '#define HAVE_VLAN_HWACCEL_PUSH_INSIDE 1' >> datapath/linux/kcompat.h.new
+
+        ;;
+      1)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        ;;
+      *)
+        as_fn_error $? "grep exited with status $status" "$LINENO" 5
+        ;;
+    esac
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+
+  fi
+
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ipv4_is_multicast matches in $KSRC/include/linux/in.h" >&5
 $as_echo_n "checking whether ipv4_is_multicast matches in $KSRC/include/linux/in.h... " >&6; }
@@ -15843,6 +15993,35 @@
   fi
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether proto_ports_offset matches in $KSRC/include/linux/in.h" >&5
+$as_echo_n "checking whether proto_ports_offset matches in $KSRC/include/linux/in.h... " >&6; }
+  if test -f $KSRC/include/linux/in.h; then
+    grep 'proto_ports_offset' $KSRC/include/linux/in.h >/dev/null 2>&1
+    status=$?
+    case $status in
+      0)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  echo '#define HAVE_PROTO_PORTS_OFFSET 1' >> datapath/linux/kcompat.h.new
+
+        ;;
+      1)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        ;;
+      *)
+        as_fn_error $? "grep exited with status $status" "$LINENO" 5
+        ;;
+    esac
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+
+  fi
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __ip_select_ident.*dst_entry matches in $KSRC/include/net/ip.h" >&5
 $as_echo_n "checking whether __ip_select_ident.*dst_entry matches in $KSRC/include/net/ip.h... " >&6; }
   if test -f $KSRC/include/net/ip.h; then
@@ -15901,6 +16080,35 @@
   fi
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ip_is_fragment matches in $KSRC/include/net/ip.h" >&5
+$as_echo_n "checking whether ip_is_fragment matches in $KSRC/include/net/ip.h... " >&6; }
+  if test -f $KSRC/include/net/ip.h; then
+    grep 'ip_is_fragment' $KSRC/include/net/ip.h >/dev/null 2>&1
+    status=$?
+    case $status in
+      0)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  echo '#define HAVE_IP_IS_FRAGMENT 1' >> datapath/linux/kcompat.h.new
+
+        ;;
+      1)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        ;;
+      *)
+        as_fn_error $? "grep exited with status $status" "$LINENO" 5
+        ;;
+    esac
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+
+  fi
+
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dev_disable_lro matches in $KSRC/include/linux/netdevice.h" >&5
 $as_echo_n "checking whether dev_disable_lro matches in $KSRC/include/linux/netdevice.h... " >&6; }
@@ -16105,6 +16313,93 @@
   fi
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netdev_rx_handler_register matches in $KSRC/include/linux/netdevice.h" >&5
+$as_echo_n "checking whether netdev_rx_handler_register matches in $KSRC/include/linux/netdevice.h... " >&6; }
+  if test -f $KSRC/include/linux/netdevice.h; then
+    grep 'netdev_rx_handler_register' $KSRC/include/linux/netdevice.h >/dev/null 2>&1
+    status=$?
+    case $status in
+      0)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  echo '#define HAVE_NETDEV_RX_HANDLER_REGISTER 1' >> datapath/linux/kcompat.h.new
+
+        ;;
+      1)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        ;;
+      *)
+        as_fn_error $? "grep exited with status $status" "$LINENO" 5
+        ;;
+    esac
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether net_device_extended matches in $KSRC/include/linux/netdevice.h" >&5
+$as_echo_n "checking whether net_device_extended matches in $KSRC/include/linux/netdevice.h... " >&6; }
+  if test -f $KSRC/include/linux/netdevice.h; then
+    grep 'net_device_extended' $KSRC/include/linux/netdevice.h >/dev/null 2>&1
+    status=$?
+    case $status in
+      0)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  echo '#define HAVE_NET_DEVICE_EXTENDED 1' >> datapath/linux/kcompat.h.new
+
+        ;;
+      1)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        ;;
+      *)
+        as_fn_error $? "grep exited with status $status" "$LINENO" 5
+        ;;
+    esac
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether rx_handler_func_t.*pskb matches in $KSRC/include/linux/netdevice.h" >&5
+$as_echo_n "checking whether rx_handler_func_t.*pskb matches in $KSRC/include/linux/netdevice.h... " >&6; }
+  if test -f $KSRC/include/linux/netdevice.h; then
+    grep 'rx_handler_func_t.*pskb' $KSRC/include/linux/netdevice.h >/dev/null 2>&1
+    status=$?
+    case $status in
+      0)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  echo '#define HAVE_RX_HANDLER_PSKB 1' >> datapath/linux/kcompat.h.new
+
+        ;;
+      1)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        ;;
+      *)
+        as_fn_error $? "grep exited with status $status" "$LINENO" 5
+        ;;
+    esac
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+
+  fi
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether nf_hookfn.*nf_hook_ops matches in $KSRC/include/linux/netfilter.h" >&5
 $as_echo_n "checking whether nf_hookfn.*nf_hook_ops matches in $KSRC/include/linux/netfilter.h... " >&6; }
   if test -f $KSRC/include/linux/netfilter.h; then
@@ -16314,6 +16609,35 @@
   fi
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether skb_checksum_start_offset matches in $KSRC/include/linux/skbuff.h" >&5
+$as_echo_n "checking whether skb_checksum_start_offset matches in $KSRC/include/linux/skbuff.h... " >&6; }
+  if test -f $KSRC/include/linux/skbuff.h; then
+    grep 'skb_checksum_start_offset' $KSRC/include/linux/skbuff.h >/dev/null 2>&1
+    status=$?
+    case $status in
+      0)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  echo '#define HAVE_SKB_CHECKSUM_START_OFFSET 1' >> datapath/linux/kcompat.h.new
+
+        ;;
+      1)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        ;;
+      *)
+        as_fn_error $? "grep exited with status $status" "$LINENO" 5
+        ;;
+    esac
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+
+  fi
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether kfree_skb_list matches in $KSRC/include/linux/skbuff.h" >&5
 $as_echo_n "checking whether kfree_skb_list matches in $KSRC/include/linux/skbuff.h... " >&6; }
   if test -f $KSRC/include/linux/skbuff.h; then
@@ -16894,10 +17218,10 @@
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether l4_rxhash matches in $KSRC/include/linux/skbuff.h" >&5
-$as_echo_n "checking whether l4_rxhash matches in $KSRC/include/linux/skbuff.h... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether u8.*l4_rxhash matches in $KSRC/include/linux/skbuff.h" >&5
+$as_echo_n "checking whether u8.*l4_rxhash matches in $KSRC/include/linux/skbuff.h... " >&6; }
   if test -f $KSRC/include/linux/skbuff.h; then
-    grep 'l4_rxhash' $KSRC/include/linux/skbuff.h >/dev/null 2>&1
+    grep 'u8.*l4_rxhash' $KSRC/include/linux/skbuff.h >/dev/null 2>&1
     status=$?
     case $status in
       0)
@@ -17624,6 +17948,35 @@
   fi
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether void.*netlink_set_err matches in $KSRC/include/linux/netlink.h" >&5
+$as_echo_n "checking whether void.*netlink_set_err matches in $KSRC/include/linux/netlink.h... " >&6; }
+  if test -f $KSRC/include/linux/netlink.h; then
+    grep 'void.*netlink_set_err' $KSRC/include/linux/netlink.h >/dev/null 2>&1
+    status=$?
+    case $status in
+      0)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  echo '#define HAVE_VOID_NETLINK_SET_ERR 1' >> datapath/linux/kcompat.h.new
+
+        ;;
+      1)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        ;;
+      *)
+        as_fn_error $? "grep exited with status $status" "$LINENO" 5
+        ;;
+    esac
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+
+  fi
+
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sctp_compute_cksum matches in $KSRC/include/net/sctp/checksum.h" >&5
 $as_echo_n "checking whether sctp_compute_cksum matches in $KSRC/include/net/sctp/checksum.h... " >&6; }
@@ -18061,6 +18414,36 @@
   fi
 
 
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether el6 matches in $KSRC/include/linux/utsrelease.h" >&5
+$as_echo_n "checking whether el6 matches in $KSRC/include/linux/utsrelease.h... " >&6; }
+  if test -f $KSRC/include/linux/utsrelease.h; then
+    grep 'el6' $KSRC/include/linux/utsrelease.h >/dev/null 2>&1
+    status=$?
+    case $status in
+      0)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  echo '#define HAVE_RHEL6_PER_CPU 1' >> datapath/linux/kcompat.h.new
+
+        ;;
+      1)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        ;;
+      *)
+        as_fn_error $? "grep exited with status $status" "$LINENO" 5
+        ;;
+    esac
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+
+  fi
+
+
   if cmp -s datapath/linux/kcompat.h.new \
             datapath/linux/kcompat.h >/dev/null 2>&1; then
     rm datapath/linux/kcompat.h.new
@@ -18247,11 +18630,38 @@
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=1;;
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
 
@@ -18364,6 +18774,14 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -18761,16 +19179,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -18830,28 +19248,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -18872,8 +19278,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by openvswitch $as_me 2.4.0, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by openvswitch $as_me 2.4.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -18938,11 +19344,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-openvswitch config.status 2.4.0
-configured by $0, generated by GNU Autoconf 2.68,
+openvswitch config.status 2.4.1
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -19033,7 +19439,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -19076,6 +19482,7 @@
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -19158,7 +19565,6 @@
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -19214,6 +19620,7 @@
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -19264,7 +19671,6 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -19967,7 +20373,7 @@
     "tests/atconfig":C) cat >tests/atconfig < 0;
 		 a = nla_next(a, &rem)) {
+		u32 probability;
+
 		switch (nla_type(a)) {
 		case OVS_SAMPLE_ATTR_PROBABILITY:
-			if (prandom_u32() >= nla_get_u32(a))
+			probability = nla_get_u32(a);
+			if (!probability || prandom_u32() > probability)
 				return 0;
 			break;
 
diff -Nru openvswitch-2.4.0/datapath/datapath.c openvswitch-2.4.1/datapath/datapath.c
--- openvswitch-2.4.0/datapath/datapath.c	2015-08-21 00:18:21.026479285 +0000
+++ openvswitch-2.4.1/datapath/datapath.c	2016-03-22 13:09:54.402615367 +0000
@@ -917,7 +917,7 @@
 	if (error)
 		goto err_kfree_flow;
 
-	ovs_flow_mask_key(&new_flow->key, &key, &mask);
+	ovs_flow_mask_key(&new_flow->key, &key, true, &mask);
 
 	/* Extract flow identifier. */
 	error = ovs_nla_get_identifier(&new_flow->id, a[OVS_FLOW_ATTR_UFID],
@@ -1044,7 +1044,7 @@
 	struct sw_flow_key masked_key;
 	int error;
 
-	ovs_flow_mask_key(&masked_key, key, mask);
+	ovs_flow_mask_key(&masked_key, key, true, mask);
 	error = ovs_nla_copy_actions(a, &masked_key, &acts, log);
 	if (error) {
 		OVS_NLERR(log,
diff -Nru openvswitch-2.4.0/datapath/flow_netlink.c openvswitch-2.4.1/datapath/flow_netlink.c
--- openvswitch-2.4.0/datapath/flow_netlink.c	2015-08-21 00:18:21.062479285 +0000
+++ openvswitch-2.4.1/datapath/flow_netlink.c	2016-03-22 13:09:54.402615367 +0000
@@ -2266,14 +2266,20 @@
 						struct sk_buff *skb)
 {
 	const struct nlattr *ovs_key = nla_data(a);
+	struct nlattr *nla;
 	size_t key_len = nla_len(ovs_key) / 2;
 
 	/* Revert the conversion we did from a non-masked set action to
 	 * masked set action.
 	 */
-	if (nla_put(skb, OVS_ACTION_ATTR_SET, nla_len(a) - key_len, ovs_key))
+	nla = nla_nest_start(skb, OVS_ACTION_ATTR_SET);
+	if (!nla)
 		return -EMSGSIZE;
 
+	if (nla_put(skb, nla_type(ovs_key), key_len, nla_data(ovs_key)))
+		return -EMSGSIZE;
+
+	nla_nest_end(skb, nla);
 	return 0;
 }
 
diff -Nru openvswitch-2.4.0/datapath/flow_table.c openvswitch-2.4.1/datapath/flow_table.c
--- openvswitch-2.4.0/datapath/flow_table.c	2015-08-20 16:51:40.558995144 +0000
+++ openvswitch-2.4.1/datapath/flow_table.c	2016-03-22 13:09:54.402615367 +0000
@@ -63,20 +63,21 @@
 }
 
 void ovs_flow_mask_key(struct sw_flow_key *dst, const struct sw_flow_key *src,
-		       const struct sw_flow_mask *mask)
+		       bool full, const struct sw_flow_mask *mask)
 {
-	const long *m = (const long *)((const u8 *)&mask->key +
-				mask->range.start);
-	const long *s = (const long *)((const u8 *)src +
-				mask->range.start);
-	long *d = (long *)((u8 *)dst + mask->range.start);
+	int start = full ? 0 : mask->range.start;
+	int len = full ? sizeof *dst : range_n_bytes(&mask->range);
+	const long *m = (const long *)((const u8 *)&mask->key + start);
+	const long *s = (const long *)((const u8 *)src + start);
+	long *d = (long *)((u8 *)dst + start);
 	int i;
 
-	/* The memory outside of the 'mask->range' are not set since
-	 * further operations on 'dst' only uses contents within
-	 * 'mask->range'.
+	/* If 'full' is true then all of 'dst' is fully initialized. Otherwise,
+	 * if 'full' is false the memory outside of the 'mask->range' is left
+	 * uninitialized. This can be used as an optimization when further
+	 * operations on 'dst' only use contents within 'mask->range'.
 	 */
-	for (i = 0; i < range_n_bytes(&mask->range); i += sizeof(long))
+	for (i = 0; i < len; i += sizeof(long))
 		*d++ = *s++ & *m++;
 }
 
@@ -554,7 +555,7 @@
 	u32 hash;
 	struct sw_flow_key masked_key;
 
-	ovs_flow_mask_key(&masked_key, unmasked, mask);
+	ovs_flow_mask_key(&masked_key, unmasked, false, mask);
 	hash = flow_hash(&masked_key, &mask->range);
 	head = find_bucket(ti, hash);
 	(*n_mask_hit)++;
@@ -988,7 +989,7 @@
 	BUILD_BUG_ON(sizeof(struct sw_flow_key) % sizeof(long));
 
 	flow_cache = kmem_cache_create("sw_flow", sizeof(struct sw_flow)
-				       + (num_possible_nodes()
+				       + (nr_node_ids
 					  * sizeof(struct flow_stats *)),
 				       0, 0, NULL);
 	if (flow_cache == NULL)
diff -Nru openvswitch-2.4.0/datapath/flow_table.h openvswitch-2.4.1/datapath/flow_table.h
--- openvswitch-2.4.0/datapath/flow_table.h	2015-08-11 20:38:17.431292526 +0000
+++ openvswitch-2.4.1/datapath/flow_table.h	2016-03-22 13:09:54.402615367 +0000
@@ -99,5 +99,5 @@
 bool ovs_flow_cmp(const struct sw_flow *, const struct sw_flow_match *);
 
 void ovs_flow_mask_key(struct sw_flow_key *dst, const struct sw_flow_key *src,
-		       const struct sw_flow_mask *mask);
+		       bool full, const struct sw_flow_mask *mask);
 #endif /* flow_table.h */
diff -Nru openvswitch-2.4.0/datapath/linux/compat/dev-openvswitch.c openvswitch-2.4.1/datapath/linux/compat/dev-openvswitch.c
--- openvswitch-2.4.0/datapath/linux/compat/dev-openvswitch.c	2015-08-11 20:38:17.431292526 +0000
+++ openvswitch-2.4.1/datapath/linux/compat/dev-openvswitch.c	2016-03-22 13:09:54.402615367 +0000
@@ -33,7 +33,7 @@
 
 #endif /* HAVE_DEV_DISABLE_LRO */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) || \
+#if !defined HAVE_NETDEV_RX_HANDLER_REGISTER || \
     defined HAVE_RHEL_OVS_HOOK
 
 static int nr_bridges;
diff -Nru openvswitch-2.4.0/datapath/linux/compat/include/linux/if_vlan.h openvswitch-2.4.1/datapath/linux/compat/include/linux/if_vlan.h
--- openvswitch-2.4.0/datapath/linux/compat/include/linux/if_vlan.h	2015-08-11 20:38:17.439292814 +0000
+++ openvswitch-2.4.1/datapath/linux/compat/include/linux/if_vlan.h	2016-03-22 13:09:54.402615367 +0000
@@ -52,7 +52,8 @@
 }
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
+#ifndef HAVE_VLAN_HWACCEL_PUSH_INSIDE
+
 /*
  * __vlan_hwaccel_push_inside - pushes vlan tag to the payload
  * @skb: skbuff to tag
diff -Nru openvswitch-2.4.0/datapath/linux/compat/include/linux/in.h openvswitch-2.4.1/datapath/linux/compat/include/linux/in.h
--- openvswitch-2.4.0/datapath/linux/compat/include/linux/in.h	2015-06-20 23:18:21.108108323 +0000
+++ openvswitch-2.4.1/datapath/linux/compat/include/linux/in.h	2016-03-22 13:09:54.402615367 +0000
@@ -4,7 +4,7 @@
 #include_next 
 
 #include 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+#ifndef HAVE_PROTO_PORTS_OFFSET
 static inline int proto_ports_offset(int proto)
 {
 	switch (proto) {
diff -Nru openvswitch-2.4.0/datapath/linux/compat/include/linux/netdevice.h openvswitch-2.4.1/datapath/linux/compat/include/linux/netdevice.h
--- openvswitch-2.4.0/datapath/linux/compat/include/linux/netdevice.h	2015-08-11 20:38:17.439292814 +0000
+++ openvswitch-2.4.1/datapath/linux/compat/include/linux/netdevice.h	2016-03-22 13:09:54.402615367 +0000
@@ -43,7 +43,7 @@
 extern void dev_disable_lro(struct net_device *dev);
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) || \
+#if !defined HAVE_NETDEV_RX_HANDLER_REGISTER || \
     defined HAVE_RHEL_OVS_HOOK
 
 #ifdef HAVE_RHEL_OVS_HOOK
diff -Nru openvswitch-2.4.0/datapath/linux/compat/include/linux/percpu.h openvswitch-2.4.1/datapath/linux/compat/include/linux/percpu.h
--- openvswitch-2.4.0/datapath/linux/compat/include/linux/percpu.h	2015-08-11 20:38:17.447293098 +0000
+++ openvswitch-2.4.1/datapath/linux/compat/include/linux/percpu.h	2016-03-22 13:09:54.402615367 +0000
@@ -7,7 +7,7 @@
 #define this_cpu_ptr(ptr) per_cpu_ptr(ptr, smp_processor_id())
 #endif
 
-#ifdef HAVE_RHEL_OVS_HOOK
+#ifdef HAVE_RHEL6_PER_CPU
 #undef this_cpu_read
 #undef this_cpu_inc
 #undef this_cpu_dec
diff -Nru openvswitch-2.4.0/datapath/linux/compat/include/linux/skbuff.h openvswitch-2.4.1/datapath/linux/compat/include/linux/skbuff.h
--- openvswitch-2.4.0/datapath/linux/compat/include/linux/skbuff.h	2015-08-11 20:38:17.447293098 +0000
+++ openvswitch-2.4.1/datapath/linux/compat/include/linux/skbuff.h	2016-03-22 13:09:54.402615367 +0000
@@ -372,4 +372,35 @@
 void rpl_kfree_skb_list(struct sk_buff *segs);
 #define kfree_skb_list rpl_kfree_skb_list
 #endif
+
+#ifndef HAVE_SKB_CHECKSUM_START_OFFSET
+static inline int skb_checksum_start_offset(const struct sk_buff *skb)
+{
+	return skb->csum_start - skb_headroom(skb);
+}
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
+#define skb_postpull_rcsum rpl_skb_postpull_rcsum
+static inline void skb_postpull_rcsum(struct sk_buff *skb,
+				      const void *start, unsigned int len)
+{
+	if (skb->ip_summed == CHECKSUM_COMPLETE)
+		skb->csum = csum_sub(skb->csum, csum_partial(start, len, 0));
+	else if (skb->ip_summed == CHECKSUM_PARTIAL &&
+			skb_checksum_start_offset(skb) <= len)
+		skb->ip_summed = CHECKSUM_NONE;
+}
+
+#define skb_pull_rcsum rpl_skb_pull_rcsum
+static inline unsigned char *skb_pull_rcsum(struct sk_buff *skb, unsigned int len)
+{
+	BUG_ON(len > skb->len);
+	skb->len -= len;
+	BUG_ON(skb->len < skb->data_len);
+	skb_postpull_rcsum(skb, skb->data, len);
+	return skb->data += len;
+}
+
+#endif
 #endif
diff -Nru openvswitch-2.4.0/datapath/linux/compat/include/net/genetlink.h openvswitch-2.4.1/datapath/linux/compat/include/net/genetlink.h
--- openvswitch-2.4.0/datapath/linux/compat/include/net/genetlink.h	2015-08-11 20:38:17.447293098 +0000
+++ openvswitch-2.4.1/datapath/linux/compat/include/net/genetlink.h	2016-03-22 13:09:54.406615451 +0000
@@ -67,7 +67,7 @@
 static inline int genl_set_err(struct genl_family *family, struct net *net,
 			       u32 portid, u32 group, int code)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+#ifdef HAVE_VOID_NETLINK_SET_ERR
 	netlink_set_err(net->genl_sock, portid, group, code);
 	return 0;
 #else
diff -Nru openvswitch-2.4.0/datapath/linux/compat/include/net/ip.h openvswitch-2.4.1/datapath/linux/compat/include/net/ip.h
--- openvswitch-2.4.0/datapath/linux/compat/include/net/ip.h	2015-08-11 20:38:17.447293098 +0000
+++ openvswitch-2.4.1/datapath/linux/compat/include/net/ip.h	2016-03-22 13:09:54.406615451 +0000
@@ -5,7 +5,7 @@
 
 #include 
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
+#ifndef HAVE_IP_IS_FRAGMENT
 static inline bool ip_is_fragment(const struct iphdr *iph)
 {
 	return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0;
diff -Nru openvswitch-2.4.0/datapath/linux/compat/stt.c openvswitch-2.4.1/datapath/linux/compat/stt.c
--- openvswitch-2.4.0/datapath/linux/compat/stt.c	2015-08-11 20:38:17.447293098 +0000
+++ openvswitch-2.4.1/datapath/linux/compat/stt.c	2016-03-22 13:09:54.406615451 +0000
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff -Nru openvswitch-2.4.0/datapath/linux/compat/udp_tunnel.c openvswitch-2.4.1/datapath/linux/compat/udp_tunnel.c
--- openvswitch-2.4.0/datapath/linux/compat/udp_tunnel.c	2015-08-11 20:38:17.447293098 +0000
+++ openvswitch-2.4.1/datapath/linux/compat/udp_tunnel.c	2016-03-22 13:09:54.406615451 +0000
@@ -137,7 +137,7 @@
 	/* csum segment if tunnel sets skb with csum. The cleanest way
 	 * to do this just to set it up from scratch. */
 	skb->ip_summed = CHECKSUM_NONE;
-	udp_set_csum(true, skb, iph->saddr, iph->daddr,
+	udp_set_csum(false, skb, iph->saddr, iph->daddr,
 		     skb->len - udp_offset);
 }
 EXPORT_SYMBOL_GPL(ovs_udp_csum_gso);
diff -Nru openvswitch-2.4.0/datapath/Makefile.in openvswitch-2.4.1/datapath/Makefile.in
--- openvswitch-2.4.0/datapath/Makefile.in	2015-08-21 17:00:52.419248723 +0000
+++ openvswitch-2.4.1/datapath/Makefile.in	2016-03-22 13:11:00.364235440 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,8 +78,8 @@
 build_triplet = @build@
 host_triplet = @host@
 @LINUX_ENABLED_TRUE@am__append_1 = linux
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/Modules.mk $(srcdir)/linux/Modules.mk
+DIST_COMMON = $(srcdir)/Modules.mk $(srcdir)/linux/Modules.mk \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am
 subdir = datapath
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \
@@ -52,26 +96,58 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = linux
@@ -391,9 +467,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu datapath/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign datapath/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu datapath/Makefile
+	  $(AUTOMAKE) --foreign datapath/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -403,6 +479,7 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/Modules.mk $(srcdir)/linux/Modules.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -420,22 +497,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -450,57 +530,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -516,12 +551,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -533,15 +563,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -550,6 +576,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -586,13 +627,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -627,10 +665,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -709,22 +752,20 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am all-local check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive distclean \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+	check check-am clean clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
 
 
 # The following is based on commands for the Automake "distdir" target.
diff -Nru openvswitch-2.4.0/datapath/vport-netdev.c openvswitch-2.4.1/datapath/vport-netdev.c
--- openvswitch-2.4.0/datapath/vport-netdev.c	2015-08-20 16:51:40.558995144 +0000
+++ openvswitch-2.4.1/datapath/vport-netdev.c	2016-03-22 13:09:54.406615451 +0000
@@ -38,7 +38,7 @@
 static struct vport_ops ovs_netdev_vport_ops;
 static void netdev_port_receive(struct vport *vport, struct sk_buff *skb);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
+#if defined HAVE_RX_HANDLER_PSKB  /* 2.6.39 and above or backports */
 /* Called with rcu_read_lock and bottom-halves disabled. */
 static rx_handler_result_t netdev_frame_hook(struct sk_buff **pskb)
 {
@@ -257,7 +257,7 @@
 /* Returns null if this device is not attached to a datapath. */
 struct vport *ovs_netdev_get_vport(struct net_device *dev)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) || \
+#if defined HAVE_NETDEV_RX_HANDLER_REGISTER || \
     defined HAVE_RHEL_OVS_HOOK
 #ifdef HAVE_OVS_DATAPATH
 	if (likely(dev->priv_flags & IFF_OVS_DATAPATH))
@@ -267,8 +267,13 @@
 #ifdef HAVE_RHEL_OVS_HOOK
 		return (struct vport *)rcu_dereference_rtnl(dev->ax25_ptr);
 #else
+#ifdef HAVE_NET_DEVICE_EXTENDED
+		return (struct vport *)
+			rcu_dereference_rtnl(netdev_extended(dev)->rx_handler_data);
+#else
 		return (struct vport *)rcu_dereference_rtnl(dev->rx_handler_data);
 #endif
+#endif
 	else
 		return NULL;
 #else
@@ -294,7 +299,7 @@
 	ovs_vport_ops_unregister(&ovs_netdev_vport_ops);
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) && \
+#if !defined HAVE_NETDEV_RX_HANDLER_REGISTER && \
     !defined HAVE_RHEL_OVS_HOOK
 /*
  * Enforces, mutual exclusion with the Linux bridge module, by declaring and
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/Actions.c openvswitch-2.4.1/datapath-windows/ovsext/Actions.c
--- openvswitch-2.4.0/datapath-windows/ovsext/Actions.c	2015-08-20 00:33:42.708961842 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/Actions.c	2016-03-22 13:09:54.394615204 +0000
@@ -566,9 +566,10 @@
 
     /* Assert that in the Rx direction, key is always setup. */
     ASSERT(ovsFwdCtx->tunnelRxNic == NULL || ovsFwdCtx->tunKey.dst != 0);
-    status = OvsExtractFlow(ovsFwdCtx->curNbl, ovsFwdCtx->srcVportNo,
-                          &key, &ovsFwdCtx->layers, ovsFwdCtx->tunKey.dst != 0 ?
-                                         &ovsFwdCtx->tunKey : NULL);
+    status =
+        OvsExtractFlow(ovsFwdCtx->curNbl, ovsFwdCtx->srcVportNo,
+                       &key, &ovsFwdCtx->layers,
+                       ovsFwdCtx->tunKey.dst != 0 ? &ovsFwdCtx->tunKey : NULL);
     if (status != NDIS_STATUS_SUCCESS) {
         OvsCompleteNBLForwardingCtx(ovsFwdCtx,
                                     L"OVS-Flow extract failed");
@@ -581,18 +582,17 @@
         OvsFlowUsed(flow, ovsFwdCtx->curNbl, &ovsFwdCtx->layers);
         ovsFwdCtx->switchContext->datapath.hits++;
         status = OvsActionsExecute(ovsFwdCtx->switchContext,
-                                 ovsFwdCtx->completionList, ovsFwdCtx->curNbl,
-                                 ovsFwdCtx->srcVportNo, ovsFwdCtx->sendFlags,
-                                 &key, &hash, &ovsFwdCtx->layers,
-                                 flow->actions, flow->actionsLen);
+                                   ovsFwdCtx->completionList, ovsFwdCtx->curNbl,
+                                   ovsFwdCtx->srcVportNo, ovsFwdCtx->sendFlags,
+                                   &key, &hash, &ovsFwdCtx->layers,
+                                   flow->actions, flow->actionsLen);
         ovsFwdCtx->curNbl = NULL;
     } else {
         LIST_ENTRY missedPackets;
         UINT32 num = 0;
         ovsFwdCtx->switchContext->datapath.misses++;
         InitializeListHead(&missedPackets);
-        status = OvsCreateAndAddPackets(NULL, 0, OVS_PACKET_CMD_MISS,
-                          ovsFwdCtx->srcVportNo,
+        status = OvsCreateAndAddPackets(NULL, 0, OVS_PACKET_CMD_MISS, vport,
                           &key,ovsFwdCtx->curNbl,
                           ovsFwdCtx->tunnelRxNic != NULL, &ovsFwdCtx->layers,
                           ovsFwdCtx->switchContext, &missedPackets, &num);
@@ -947,7 +947,6 @@
 {
     PNET_BUFFER_LIST newNbl;
     NDIS_STATUS status = NDIS_STATUS_SUCCESS;
-    PNET_BUFFER nb;
 
     /*
      * Create a copy and work on the copy after this point. The original NBL is
@@ -967,14 +966,14 @@
      * XXX Head room needs to include the additional encap.
      * XXX copySize check is not considering multiple NBs.
      */
-    nb = NET_BUFFER_LIST_FIRST_NB(ovsFwdCtx->curNbl);
     newNbl = OvsPartialCopyNBL(ovsFwdCtx->switchContext, ovsFwdCtx->curNbl,
                                0, 0, TRUE /*copy NBL info*/);
 
     ASSERT(ovsFwdCtx->destPortsSizeOut > 0 ||
            ovsFwdCtx->tunnelTxNic != NULL || ovsFwdCtx->tunnelRxNic != NULL);
 
-    /* Send the original packet out */
+    /* Send the original packet out and save the original source port number */
+    UINT32 tempVportNo = ovsFwdCtx->srcVportNo;
     status = OvsOutputForwardingCtx(ovsFwdCtx);
     ASSERT(ovsFwdCtx->curNbl == NULL);
     ASSERT(ovsFwdCtx->destPortsSizeOut == 0);
@@ -992,7 +991,7 @@
         OvsCompleteNBL(ovsFwdCtx->switchContext, newNbl, TRUE);
     } else {
         status = OvsInitForwardingCtx(ovsFwdCtx, ovsFwdCtx->switchContext,
-                                      newNbl, ovsFwdCtx->srcVportNo, 0,
+                                      newNbl, tempVportNo, 0,
                                       NET_BUFFER_LIST_SWITCH_FORWARDING_DETAIL(newNbl),
                                       ovsFwdCtx->completionList,
                                       &ovsFwdCtx->layers, FALSE);
@@ -1531,7 +1530,7 @@
             elem = OvsCreateQueueNlPacket((PVOID)userdataAttr,
                                     userdataAttr->nlaLen,
                                     OVS_PACKET_CMD_ACTION,
-                                    portNo, key,ovsFwdCtx.curNbl,
+                                    vport, key, ovsFwdCtx.curNbl,
                                     NET_BUFFER_LIST_FIRST_NB(ovsFwdCtx.curNbl),
                                     isRecv,
                                     layers);
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/Datapath.c openvswitch-2.4.1/datapath-windows/ovsext/Datapath.c
--- openvswitch-2.4.0/datapath-windows/ovsext/Datapath.c	2015-08-20 00:33:42.716962165 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/Datapath.c	2016-03-22 13:09:54.394615204 +0000
@@ -89,11 +89,8 @@
 
 /* Handlers for the various netlink commands. */
 static NetlinkCmdHandler OvsPendEventCmdHandler,
-                         OvsPendPacketCmdHandler,
                          OvsSubscribeEventCmdHandler,
-                         OvsSubscribePacketCmdHandler,
                          OvsReadEventCmdHandler,
-                         OvsReadPacketCmdHandler,
                          OvsNewDpCmdHandler,
                          OvsGetDpCmdHandler,
                          OvsSetDpCmdHandler;
@@ -102,7 +99,10 @@
                          OvsGetVportCmdHandler,
                          OvsSetVportCmdHandler,
                          OvsNewVportCmdHandler,
-                         OvsDeleteVportCmdHandler;
+                         OvsDeleteVportCmdHandler,
+                         OvsPendPacketCmdHandler,
+                         OvsSubscribePacketCmdHandler,
+                         OvsReadPacketCmdHandler;
 
 static NTSTATUS HandleGetDpTransaction(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
                                        UINT32 *replyLen);
@@ -918,10 +918,6 @@
 exit:
     /* Should not complete a pending IRP unless proceesing is completed. */
     if (status == STATUS_PENDING) {
-        /* STATUS_PENDING is returned by the NL handler when the request is
-         * to be processed later, so we mark the IRP as pending and complete
-         * it in another thread when the request is processed. */
-        IoMarkIrpPending(irp);
         return status;
     }
     return OvsCompleteIrpRequest(irp, (ULONG_PTR)replyLen, status);
@@ -1180,7 +1176,8 @@
     POVS_MESSAGE msgIn = (POVS_MESSAGE)usrParamsCtx->inputBuffer;
 
     rc = NlAttrParse(&msgIn->nlMsg, sizeof (*msgIn),
-         NlMsgAttrsLen((PNL_MSG_HDR)msgIn), policy, attrs, ARRAY_SIZE(attrs));
+         NlMsgAttrsLen((PNL_MSG_HDR)msgIn), policy, ARRAY_SIZE(policy),
+                       attrs, ARRAY_SIZE(attrs));
     if (!rc) {
         status = STATUS_INVALID_PARAMETER;
         goto done;
@@ -1349,7 +1346,9 @@
         if (!NlAttrParse((PNL_MSG_HDR)msgIn,
                         NLMSG_HDRLEN + GENL_HDRLEN + OVS_HDRLEN,
                         NlMsgAttrsLen((PNL_MSG_HDR)msgIn),
-                        ovsDatapathSetPolicy, dpAttrs, ARRAY_SIZE(dpAttrs))) {
+                        ovsDatapathSetPolicy,
+                        ARRAY_SIZE(ovsDatapathSetPolicy),
+                        dpAttrs, ARRAY_SIZE(dpAttrs))) {
             return STATUS_INVALID_PARAMETER;
         }
 
@@ -1594,109 +1593,3 @@
     return status;
 }
 
-/*
- * --------------------------------------------------------------------------
- * Handler for reading missed pacckets from the driver event queue. This
- * handler is executed when user modes issues a socket receive on a socket
- * --------------------------------------------------------------------------
- */
-static NTSTATUS
-OvsReadPacketCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
-                       UINT32 *replyLen)
-{
-#ifdef DBG
-    POVS_MESSAGE msgOut = (POVS_MESSAGE)usrParamsCtx->outputBuffer;
-#endif
-    POVS_OPEN_INSTANCE instance =
-        (POVS_OPEN_INSTANCE)usrParamsCtx->ovsInstance;
-    NTSTATUS status;
-
-    ASSERT(usrParamsCtx->devOp == OVS_READ_DEV_OP);
-
-    /* Should never read events with a dump socket */
-    ASSERT(instance->dumpState.ovsMsg == NULL);
-
-    /* Must have an packet queue */
-    ASSERT(instance->packetQueue != NULL);
-
-    /* Output buffer has been validated while validating read dev op. */
-    ASSERT(msgOut != NULL && usrParamsCtx->outputLength >= sizeof *msgOut);
-
-    /* Read a packet from the instance queue */
-    status = OvsReadDpIoctl(instance->fileObject, usrParamsCtx->outputBuffer,
-                            usrParamsCtx->outputLength, replyLen);
-    return status;
-}
-
-/*
- * --------------------------------------------------------------------------
- *  Handler for the subscription for a packet queue
- * --------------------------------------------------------------------------
- */
-static NTSTATUS
-OvsSubscribePacketCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
-                            UINT32 *replyLen)
-{
-    NDIS_STATUS status;
-    BOOLEAN rc;
-    UINT8 join;
-    UINT32 pid;
-    const NL_POLICY policy[] =  {
-        [OVS_NL_ATTR_PACKET_PID] = {.type = NL_A_U32 },
-        [OVS_NL_ATTR_PACKET_SUBSCRIBE] = {.type = NL_A_U8 }
-        };
-    PNL_ATTR attrs[ARRAY_SIZE(policy)];
-
-    UNREFERENCED_PARAMETER(replyLen);
-
-    POVS_OPEN_INSTANCE instance =
-        (POVS_OPEN_INSTANCE)usrParamsCtx->ovsInstance;
-    POVS_MESSAGE msgIn = (POVS_MESSAGE)usrParamsCtx->inputBuffer;
-
-    rc = NlAttrParse(&msgIn->nlMsg, sizeof (*msgIn),
-         NlMsgAttrsLen((PNL_MSG_HDR)msgIn), policy, attrs, ARRAY_SIZE(attrs));
-    if (!rc) {
-        status = STATUS_INVALID_PARAMETER;
-        goto done;
-    }
-
-    join = NlAttrGetU8(attrs[OVS_NL_ATTR_PACKET_PID]);
-    pid = NlAttrGetU32(attrs[OVS_NL_ATTR_PACKET_PID]);
-
-    /* The socket subscribed with must be the same socket we perform receive*/
-    ASSERT(pid == instance->pid);
-
-    status = OvsSubscribeDpIoctl(instance, pid, join);
-
-    /*
-     * XXX Need to add this instance to a global data structure
-     * which hold all packet based instances. The data structure (hash)
-     * should be searched through the pid field of the instance for
-     * placing the missed packet into the correct queue
-     */
-done:
-    return status;
-}
-
-/*
- * --------------------------------------------------------------------------
- * Handler for queueing an IRP used for missed packet notification. The IRP is
- * completed when a packet received and mismatched. STATUS_PENDING is returned
- * on success. User mode keep a pending IRP at all times.
- * --------------------------------------------------------------------------
- */
-static NTSTATUS
-OvsPendPacketCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
-                       UINT32 *replyLen)
-{
-    UNREFERENCED_PARAMETER(replyLen);
-
-    POVS_OPEN_INSTANCE instance =
-        (POVS_OPEN_INSTANCE)usrParamsCtx->ovsInstance;
-
-    /*
-     * XXX access to packet queue must be through acquiring a lock as user mode
-     * could unsubscribe and the instnace will be freed.
-     */
-    return OvsWaitDpIoctl(usrParamsCtx->irp, instance->fileObject);
-}
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/Driver.c openvswitch-2.4.1/datapath-windows/ovsext/Driver.c
--- openvswitch-2.4.0/datapath-windows/ovsext/Driver.c	2015-08-11 20:38:17.371290373 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/Driver.c	2016-03-22 13:09:54.394615204 +0000
@@ -139,18 +139,26 @@
     driverObject->DriverUnload = OvsExtUnload;
 
     status = NdisFRegisterFilterDriver(driverObject,
-                                       (NDIS_HANDLE) gOvsExtDriverObject,
-                                       &driverChars, &gOvsExtDriverHandle);
+                                       (NDIS_HANDLE)gOvsExtDriverObject,
+                                       &driverChars,
+                                       &gOvsExtDriverHandle);
     if (status != NDIS_STATUS_SUCCESS) {
-        return status;
+        goto cleanup;
     }
 
-    /* Create the communication channel for usersapce. */
+    /* Create the communication channel for userspace. */
     status = OvsCreateDeviceObject(gOvsExtDriverHandle);
     if (status != NDIS_STATUS_SUCCESS) {
+        goto cleanup;
+    }
+
+cleanup:
+    if (status != NDIS_STATUS_SUCCESS){
         OvsCleanup();
-        NdisFDeregisterFilterDriver(gOvsExtDriverHandle);
-        gOvsExtDriverHandle = NULL;
+        if (gOvsExtDriverHandle) {
+            NdisFDeregisterFilterDriver(gOvsExtDriverHandle);
+            gOvsExtDriverHandle = NULL;
+        }
     }
 
     return status;
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/Flow.c openvswitch-2.4.1/datapath-windows/ovsext/Flow.c
--- openvswitch-2.4.0/datapath-windows/ovsext/Flow.c	2015-08-20 00:33:42.720962326 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/Flow.c	2016-03-22 13:09:54.398615283 +0000
@@ -102,7 +102,8 @@
                              .maxLen = sizeof(struct ovs_flow_stats),
                              .optional = TRUE},
     [OVS_FLOW_ATTR_TCP_FLAGS] = {NL_A_U8, .optional = TRUE},
-    [OVS_FLOW_ATTR_USED] = {NL_A_U64, .optional = TRUE}
+    [OVS_FLOW_ATTR_USED] = {NL_A_U64, .optional = TRUE},
+    [OVS_FLOW_ATTR_PROBE] = {.type = NL_A_FLAG, .optional = TRUE}
 };
 
 /* For Parsing nested OVS_FLOW_ATTR_KEY attributes.
@@ -171,6 +172,7 @@
                                 .maxLen = 4, .optional = TRUE},
     [OVS_KEY_ATTR_MPLS] = {.type = NL_A_VAR_LEN, .optional = TRUE}
 };
+const UINT32 nlFlowKeyPolicyLen = ARRAY_SIZE(nlFlowKeyPolicy);
 
 /* For Parsing nested OVS_KEY_ATTR_TUNNEL attributes */
 const NL_POLICY nlFlowTunnelKeyPolicy[] = {
@@ -252,7 +254,7 @@
     PNL_MSG_HDR nlMsgHdr = &(msgIn->nlMsg);
     PGENL_MSG_HDR genlMsgHdr = &(msgIn->genlMsg);
     POVS_HDR ovsHdr = &(msgIn->ovsHdr);
-    PNL_ATTR nlAttrs[__OVS_FLOW_ATTR_MAX];
+    PNL_ATTR flowAttrs[__OVS_FLOW_ATTR_MAX];
     UINT32 attrOffset = NLMSG_HDRLEN + GENL_HDRLEN + OVS_HDRLEN;
     OvsFlowPut mappedFlow;
     OvsFlowStats stats;
@@ -272,7 +274,8 @@
 
     /* Get all the top level Flow attributes */
     if ((NlAttrParse(nlMsgHdr, attrOffset, NlMsgAttrsLen(nlMsgHdr),
-                     nlFlowPolicy, nlAttrs, ARRAY_SIZE(nlAttrs)))
+                     nlFlowPolicy, ARRAY_SIZE(nlFlowPolicy),
+                     flowAttrs, ARRAY_SIZE(flowAttrs)))
                      != TRUE) {
         OVS_LOG_ERROR("Attr Parsing failed for msg: %p",
                        nlMsgHdr);
@@ -282,7 +285,7 @@
 
     /* FLOW_DEL command w/o any key input is a flush case. */
     if ((genlMsgHdr->cmd == OVS_FLOW_CMD_DEL) &&
-        (!(nlAttrs[OVS_FLOW_ATTR_KEY]))) {
+        (!(flowAttrs[OVS_FLOW_ATTR_KEY]))) {
 
         rc = OvsFlushFlowIoctl(ovsHdr->dp_ifindex);
 
@@ -307,8 +310,13 @@
        goto done;
     }
 
-    if ((rc = _MapNlToFlowPut(msgIn, nlAttrs[OVS_FLOW_ATTR_KEY],
-         nlAttrs[OVS_FLOW_ATTR_ACTIONS], nlAttrs[OVS_FLOW_ATTR_CLEAR],
+    if (flowAttrs[OVS_FLOW_ATTR_PROBE]) {
+        OVS_LOG_ERROR("Attribute OVS_FLOW_ATTR_PROBE not supported");
+        goto done;
+    }
+
+    if ((rc = _MapNlToFlowPut(msgIn, flowAttrs[OVS_FLOW_ATTR_KEY],
+         flowAttrs[OVS_FLOW_ATTR_ACTIONS], flowAttrs[OVS_FLOW_ATTR_CLEAR],
          &mappedFlow))
         != STATUS_SUCCESS) {
         OVS_LOG_ERROR("Conversion to OvsFlowPut failed");
@@ -319,6 +327,11 @@
                          &stats);
     if (rc != STATUS_SUCCESS) {
         OVS_LOG_ERROR("OvsPutFlowIoctl failed.");
+        /*
+         * Report back to the userspace the flow could not be modified,
+         * created or deleted
+         */
+        nlError = NL_ERROR_NOENT;
         goto done;
     }
 
@@ -341,6 +354,15 @@
         rc = STATUS_SUCCESS;
     }
 
+    /* Append OVS_FLOW_ATTR_KEY attribute. This is need i.e. for flow delete*/
+    if (!NlMsgPutNested(&nlBuf, OVS_FLOW_ATTR_KEY,
+                        NlAttrData(flowAttrs[OVS_FLOW_ATTR_KEY]),
+                        NlAttrGetSize(flowAttrs[OVS_FLOW_ATTR_KEY]))) {
+        OVS_LOG_ERROR("Adding OVS_FLOW_ATTR_KEY attribute failed.");
+        rc = STATUS_INVALID_BUFFER_SIZE;
+        goto done;
+    }
+
     /* Append OVS_FLOW_ATTR_STATS attribute */
     if (!NlMsgPutTailUnspec(&nlBuf, OVS_FLOW_ATTR_STATS,
         (PCHAR)(&replyStats), sizeof(replyStats))) {
@@ -376,29 +398,13 @@
                        UINT32 *replyLen)
 {
     NTSTATUS status = STATUS_SUCCESS;
-    NL_ERROR nlError = NL_ERROR_SUCCESS;
-    POVS_MESSAGE msgIn = (POVS_MESSAGE)usrParamsCtx->inputBuffer;
 
     if (usrParamsCtx->devOp == OVS_TRANSACTION_DEV_OP) {
         status = _FlowNlGetCmdHandler(usrParamsCtx, replyLen);
-
-        /* No trasanctional errors as of now.
-         * If we have something then we need to convert rc to
-         * nlError. */
-        if ((nlError != NL_ERROR_SUCCESS) &&
-            (usrParamsCtx->outputBuffer)) {
-            POVS_MESSAGE_ERROR msgError = (POVS_MESSAGE_ERROR)
-                                           usrParamsCtx->outputBuffer;
-            NlBuildErrorMsg(msgIn, msgError, nlError);
-            *replyLen = msgError->nlMsg.nlmsgLen;
-            status = STATUS_SUCCESS;
-            goto done;
-        }
     } else {
         status = _FlowNlDumpCmdHandler(usrParamsCtx, replyLen);
     }
 
-done:
     return status;
 }
 
@@ -433,6 +439,7 @@
     UINT32 keyAttrOffset = 0;
     UINT32 tunnelKeyAttrOffset = 0;
     BOOLEAN ok;
+    NL_ERROR nlError = NL_ERROR_SUCCESS;
 
     if (usrParamsCtx->inputLength > usrParamsCtx->outputLength) {
         /* Should not be the case.
@@ -446,7 +453,8 @@
 
     /* Get all the top level Flow attributes */
     if ((NlAttrParse(nlMsgHdr, attrOffset, NlMsgAttrsLen(nlMsgHdr),
-                     nlFlowPolicy, nlAttrs, ARRAY_SIZE(nlAttrs)))
+                     nlFlowPolicy, ARRAY_SIZE(nlFlowPolicy),
+                     nlAttrs, ARRAY_SIZE(nlAttrs)))
                      != TRUE) {
         OVS_LOG_ERROR("Attr Parsing failed for msg: %p",
                        nlMsgHdr);
@@ -460,7 +468,8 @@
     /* Get flow keys attributes */
     if ((NlAttrParseNested(nlMsgHdr, keyAttrOffset,
                            NlAttrLen(nlAttrs[OVS_FLOW_ATTR_KEY]),
-                           nlFlowKeyPolicy, keyAttrs, ARRAY_SIZE(keyAttrs)))
+                           nlFlowKeyPolicy, ARRAY_SIZE(nlFlowKeyPolicy),
+                           keyAttrs, ARRAY_SIZE(keyAttrs)))
                            != TRUE) {
         OVS_LOG_ERROR("Key Attr Parsing failed for msg: %p",
                        nlMsgHdr);
@@ -476,7 +485,8 @@
         /* Get tunnel keys attributes */
         if ((NlAttrParseNested(nlMsgHdr, tunnelKeyAttrOffset,
                                NlAttrLen(keyAttrs[OVS_KEY_ATTR_TUNNEL]),
-                               nlFlowTunnelKeyPolicy,
+                               nlFlowTunnelKeyPolicy, 
+                               ARRAY_SIZE(nlFlowTunnelKeyPolicy),
                                tunnelAttrs, ARRAY_SIZE(tunnelAttrs)))
                                != TRUE) {
             OVS_LOG_ERROR("Tunnel key Attr Parsing failed for msg: %p",
@@ -498,6 +508,10 @@
     rc = OvsGetFlowIoctl(&getInput, &getOutput);
     if (rc != STATUS_SUCCESS) {
         OVS_LOG_ERROR("OvsGetFlowIoctl failed.");
+        /*
+         * Report back to the userspace the flow could not be found
+         */
+        nlError = NL_ERROR_NOENT;
         goto done;
     }
 
@@ -531,6 +545,14 @@
     *replyLen += NlMsgSize(nlMsgOutHdr);
 
 done:
+    if (nlError != NL_ERROR_SUCCESS) {
+        POVS_MESSAGE_ERROR msgError = (POVS_MESSAGE_ERROR)
+                                      usrParamsCtx->outputBuffer;
+        NlBuildErrorMsg(msgIn, msgError, nlError);
+        *replyLen = msgError->nlMsg.nlmsgLen;
+        rc = STATUS_SUCCESS;
+    }
+
     return rc;
 }
 
@@ -546,9 +568,10 @@
 {
     NTSTATUS rc = STATUS_SUCCESS;
     UINT32  temp = 0;   /* To keep compiler happy for calling OvsDoDumpFlows */
-
+    NL_ERROR nlError = NL_ERROR_SUCCESS;
     POVS_OPEN_INSTANCE instance = (POVS_OPEN_INSTANCE)
                                   (usrParamsCtx->ovsInstance);
+    POVS_MESSAGE msgIn = instance->dumpState.ovsMsg;
 
     if (usrParamsCtx->devOp == OVS_WRITE_DEV_OP) {
         /* Dump Start */
@@ -556,7 +579,6 @@
         goto done;
     }
 
-    POVS_MESSAGE msgIn = instance->dumpState.ovsMsg;
     PNL_MSG_HDR nlMsgHdr = &(msgIn->nlMsg);
     PGENL_MSG_HDR genlMsgHdr = &(msgIn->genlMsg);
     POVS_HDR ovsHdr = &(msgIn->ovsHdr);
@@ -588,6 +610,10 @@
         rc = OvsDoDumpFlows(&dumpInput, &dumpOutput, &temp);
         if (rc != STATUS_SUCCESS) {
             OVS_LOG_ERROR("OvsDoDumpFlows failed with rc: %d", rc);
+            /*
+             * Report back to the userspace the flows could not be found
+             */
+            nlError = NL_ERROR_NOENT;
             break;
         }
 
@@ -657,6 +683,14 @@
     } while(TRUE);
 
 done:
+    if (nlError != NL_ERROR_SUCCESS) {
+        POVS_MESSAGE_ERROR msgError = (POVS_MESSAGE_ERROR)
+                                      usrParamsCtx->outputBuffer;
+        NlBuildErrorMsg(msgIn, msgError, nlError);
+        *replyLen = msgError->nlMsg.nlmsgLen;
+        rc = STATUS_SUCCESS;
+    }
+
     return rc;
 }
 
@@ -1182,7 +1216,8 @@
 
     /* Get flow keys attributes */
     if ((NlAttrParseNested(nlMsgHdr, keyAttrOffset, NlAttrLen(keyAttr),
-                           nlFlowKeyPolicy, keyAttrs, ARRAY_SIZE(keyAttrs)))
+                           nlFlowKeyPolicy, ARRAY_SIZE(nlFlowKeyPolicy),
+                           keyAttrs, ARRAY_SIZE(keyAttrs)))
                            != TRUE) {
         OVS_LOG_ERROR("Key Attr Parsing failed for msg: %p",
                        nlMsgHdr);
@@ -1199,6 +1234,7 @@
         if ((NlAttrParseNested(nlMsgHdr, tunnelKeyAttrOffset,
                                NlAttrLen(keyAttrs[OVS_KEY_ATTR_TUNNEL]),
                                nlFlowTunnelKeyPolicy,
+                               ARRAY_SIZE(nlFlowTunnelKeyPolicy),
                                tunnelAttrs, ARRAY_SIZE(tunnelAttrs)))
                                != TRUE) {
             OVS_LOG_ERROR("Tunnel key Attr Parsing failed for msg: %p",
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/Netlink/Netlink.c openvswitch-2.4.1/datapath-windows/ovsext/Netlink/Netlink.c
--- openvswitch-2.4.0/datapath-windows/ovsext/Netlink/Netlink.c	2015-08-11 20:38:17.375290517 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/Netlink/Netlink.c	2016-03-22 13:09:54.398615283 +0000
@@ -560,7 +560,7 @@
  * Refer nl_msg_put_nested for more details.
  * --------------------------------------------------------------------------
  */
-VOID
+BOOLEAN
 NlMsgPutNested(PNL_BUFFER buf, UINT16 type,
                const PVOID data, UINT32 size)
 {
@@ -574,6 +574,8 @@
     ASSERT(ret);
 
     NlMsgEndNested(buf, offset);
+
+    return ret;
 }
 
 /* Accessing netlink message payload */
@@ -1046,15 +1048,16 @@
 BOOLEAN
 NlAttrParse(const PNL_MSG_HDR nlMsg, UINT32 attrOffset,
             UINT32 totalAttrLen,
-            const NL_POLICY policy[],
-            PNL_ATTR attrs[], UINT32 n_attrs)
+            const NL_POLICY policy[], const UINT32 numPolicy,
+            PNL_ATTR attrs[], UINT32 numAttrs)
 {
     PNL_ATTR nla;
     UINT32 left;
     UINT32 iter;
     BOOLEAN ret = FALSE;
+    UINT32 numPolicyAttr = MIN(numPolicy, numAttrs);
 
-    RtlZeroMemory(attrs, n_attrs * sizeof *attrs);
+    RtlZeroMemory(attrs, numAttrs * sizeof *attrs);
 
 
     /* There is nothing to parse */
@@ -1073,7 +1076,7 @@
                       totalAttrLen)
     {
         UINT16 type = NlAttrType(nla);
-        if (type < n_attrs && policy[type].type != NL_A_NO_ATTR) {
+        if (type < numPolicyAttr && policy[type].type != NL_A_NO_ATTR) {
             /* Typecasting to keep the compiler happy */
             const PNL_POLICY e = (const PNL_POLICY)(&policy[type]);
             if (!NlAttrValidate(nla, e)) {
@@ -1094,7 +1097,7 @@
         goto done;
     }
 
-    for (iter = 0; iter < n_attrs; iter++) {
+    for (iter = 0; iter < numPolicyAttr; iter++) {
         const PNL_POLICY e = (const PNL_POLICY)(&policy[iter]);
         if (!e->optional && e->type != NL_A_NO_ATTR && !attrs[iter]) {
             OVS_LOG_ERROR("Required attr:%d missing", iter);
@@ -1120,9 +1123,10 @@
 BOOLEAN
 NlAttrParseNested(const PNL_MSG_HDR nlMsg, UINT32 attrOffset,
                   UINT32 totalAttrLen,
-                  const NL_POLICY policy[],
-                  PNL_ATTR attrs[], UINT32 n_attrs)
+                  const NL_POLICY policy[], const UINT32 numPolicy,
+                  PNL_ATTR attrs[], UINT32 numAttrs)
 {
     return NlAttrParse(nlMsg, attrOffset + NLA_HDRLEN,
-                       totalAttrLen - NLA_HDRLEN, policy, attrs, n_attrs);
+                       totalAttrLen - NLA_HDRLEN, policy, numPolicy,
+                       attrs, numAttrs);
 }
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/Netlink/Netlink.h openvswitch-2.4.1/datapath-windows/ovsext/Netlink/Netlink.h
--- openvswitch-2.4.0/datapath-windows/ovsext/Netlink/Netlink.h	2015-08-11 20:38:17.375290517 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/Netlink/Netlink.h	2016-03-22 13:09:54.398615283 +0000
@@ -133,10 +133,12 @@
                                 UINT16 type);
 BOOLEAN NlAttrParse(const PNL_MSG_HDR nlMsg, UINT32 attrOffset,
                     UINT32 totalAttrLen, const NL_POLICY policy[],
-                    PNL_ATTR attrs[], UINT32 n_attrs);
+                    const UINT32 numPolicy, PNL_ATTR attrs[], 
+                    UINT32 numAttrs);
 BOOLEAN NlAttrParseNested(const PNL_MSG_HDR nlMsg, UINT32 attrOffset,
                           UINT32 totalAttrLen, const NL_POLICY policy[],
-                          PNL_ATTR attrs[], UINT32 n_attrs);
+                          const UINT32 numPolicy, PNL_ATTR attrs[],
+                          UINT32 numAttrs);
 /*
  * --------------------------------------------------------------------------
  * Returns the length of attribute.
@@ -201,8 +203,8 @@
 BOOLEAN NlMsgPutHeadString(PNL_BUFFER buf, UINT16 type, PCHAR value);
 UINT32 NlMsgStartNested(PNL_BUFFER buf, UINT16 type);
 VOID NlMsgEndNested(PNL_BUFFER buf, UINT32 offset);
-VOID NlMsgPutNested(PNL_BUFFER buf, UINT16 type,
-                    const PVOID data, UINT32 size);
+BOOLEAN NlMsgPutNested(PNL_BUFFER buf, UINT16 type,
+                       const PVOID data, UINT32 size);
 
 /* These variants are convenient for iterating nested attributes. */
 #define NL_NESTED_FOR_EACH(ITER, LEFT, A)                               \
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/PacketIO.c openvswitch-2.4.1/datapath-windows/ovsext/PacketIO.c
--- openvswitch-2.4.0/datapath-windows/ovsext/PacketIO.c	2015-08-11 20:38:17.375290517 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/PacketIO.c	2016-03-22 13:09:54.398615283 +0000
@@ -333,8 +333,8 @@
                  * Otherwise, it adds it to the completionList. No need to
                  * check the return value. */
                 OvsActionsExecute(switchContext, &completionList, curNbl,
-                                portNo, SendFlags, &key, &hash, &layers,
-                                flow->actions, flow->actionsLen);
+                                  portNo, SendFlags, &key, &hash, &layers,
+                                  flow->actions, flow->actionsLen);
                 OvsReleaseDatapath(datapath, &dpLockState);
                 NdisReleaseRWLock(switchContext->dispatchLock, &lockState);
                 continue;
@@ -343,7 +343,7 @@
 
                 datapath->misses++;
                 status = OvsCreateAndAddPackets(NULL, 0, OVS_PACKET_CMD_MISS,
-                             portNo, &key, curNbl,
+                             vport, &key, curNbl,
                              sourcePort == switchContext->virtualExternalPortId,
                              &layers, switchContext, &missedPackets, &num);
                 if (status == NDIS_STATUS_SUCCESS) {
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/PacketIO.h openvswitch-2.4.1/datapath-windows/ovsext/PacketIO.h
--- openvswitch-2.4.0/datapath-windows/ovsext/PacketIO.h	2015-08-11 20:38:17.375290517 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/PacketIO.h	2016-03-22 13:09:54.398615283 +0000
@@ -49,11 +49,11 @@
                        ULONG sendFlags);
 
 NDIS_STATUS OvsActionsExecute(POVS_SWITCH_CONTEXT switchContext,
-                            OvsCompletionList *completionList,
-                            PNET_BUFFER_LIST curNbl, UINT32 srcVportNo,
-                            ULONG sendFlags, OvsFlowKey *key, UINT64 *hash,
-                            OVS_PACKET_HDR_INFO *layers,
-                            const PNL_ATTR actions, int actionsLen);
+                              OvsCompletionList *completionList,
+                              PNET_BUFFER_LIST curNbl, UINT32 srcVportNo,
+                              ULONG sendFlags, OvsFlowKey *key, UINT64 *hash,
+                              OVS_PACKET_HDR_INFO *layers,
+                              const PNL_ATTR actions, int actionsLen);
 
 VOID OvsLookupFlowOutput(POVS_SWITCH_CONTEXT switchContext,
                          VOID *compList, PNET_BUFFER_LIST curNbl);
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/Stt.c openvswitch-2.4.1/datapath-windows/ovsext/Stt.c
--- openvswitch-2.4.0/datapath-windows/ovsext/Stt.c	2015-08-20 00:33:42.720962326 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/Stt.c	2016-03-22 13:09:54.398615283 +0000
@@ -146,10 +146,16 @@
     POVS_STT_VPORT vportStt;
     UINT32 headRoom = OvsGetSttTunHdrSize();
     UINT32 tcpChksumLen;
+    PUINT8 bufferStart;
 
     UNREFERENCED_PARAMETER(layers);
 
     curNb = NET_BUFFER_LIST_FIRST_NB(curNbl);
+
+    /* Verify if inner checksum is verified */
+    BOOLEAN innerChecksumVerified = FALSE;
+    BOOLEAN innerPartialChecksum = FALSE;
+
     if (layers->isTcp) {
         NDIS_TCP_LARGE_SEND_OFFLOAD_NET_BUFFER_LIST_INFO lsoInfo;
 
@@ -165,6 +171,9 @@
     vportStt = (POVS_STT_VPORT) GetOvsVportPriv(vport);
     ASSERT(vportStt);
 
+    NDIS_TCP_IP_CHECKSUM_NET_BUFFER_LIST_INFO csumInfo;
+    csumInfo.Value = NET_BUFFER_LIST_INFO(curNbl,
+                                          TcpIpChecksumNetBufferListInfo);
     *newNbl = OvsPartialCopyNBL(switchContext, curNbl, 0, headRoom,
                                 FALSE /*copy NblInfo*/);
     if (*newNbl == NULL) {
@@ -172,6 +181,30 @@
         return NDIS_STATUS_FAILURE;
     }
 
+    curNb = NET_BUFFER_LIST_FIRST_NB(*newNbl);
+    curMdl = NET_BUFFER_CURRENT_MDL(curNb);
+    bufferStart = (PUINT8)MmGetSystemAddressForMdlSafe(curMdl,
+                                                       LowPagePriority);
+    bufferStart += NET_BUFFER_CURRENT_MDL_OFFSET(curNb);
+
+    if (layers->isIPv4 && csumInfo.Transmit.IpHeaderChecksum) {
+        IPHdr *ip = (IPHdr *)(bufferStart + layers->l3Offset);
+        ip->check = IPChecksum((UINT8 *)ip, ip->ihl * 4, 0);
+    }
+    if (layers->isTcp) {
+        if(!csumInfo.Transmit.TcpChecksum) {
+            innerChecksumVerified = TRUE;
+        } else {
+            innerPartialChecksum = TRUE;
+        }
+    } else if (layers->isUdp) {
+        if(!csumInfo.Transmit.UdpChecksum) {
+            innerChecksumVerified = TRUE;
+        } else {
+            innerPartialChecksum = TRUE;
+        }
+    }
+
     curNbl = *newNbl;
     curNb = NET_BUFFER_LIST_FIRST_NB(curNbl);
     /* NB Chain should be split before */
@@ -243,7 +276,6 @@
     outerIpHdr->check = 0;
     outerIpHdr->saddr = fwdInfo->srcIpAddr;
     outerIpHdr->daddr = tunKey->dst;
-    outerIpHdr->check = IPChecksum((uint8 *)outerIpHdr, sizeof *outerIpHdr, 0);
 
     /* L4 header */
     RtlZeroMemory(outerTcpHdr, sizeof *outerTcpHdr);
@@ -266,6 +298,11 @@
 
     /* XXX need to peek into the inner packet, hard code for now */
     sttHdr->flags = STT_PROTO_IPV4;
+    if (innerChecksumVerified) {
+        sttHdr->flags |= STT_CSUM_VERIFIED;
+    } else if (innerPartialChecksum) {
+        sttHdr->flags |= STT_CSUM_PARTIAL;
+    }
     sttHdr->l4Offset = 0;
 
     sttHdr->reserved = 0;
@@ -276,13 +313,15 @@
     /* Zero out stt padding */
     *(uint16 *)(sttHdr + 1) = 0;
 
-    /* Calculate software tcp checksum */
-    outerTcpHdr->check = CalculateChecksumNB(curNb, (uint16) tcpChksumLen,
-                                             sizeof(EthHdr) + sizeof(IPHdr));
-    if (outerTcpHdr->check == 0) {
-        status = NDIS_STATUS_FAILURE;
-        goto ret_error;
-    }
+    /* Offload IP and TCP checksum */
+    csumInfo.Value = 0;
+    csumInfo.Transmit.IpHeaderChecksum = 1;
+    csumInfo.Transmit.TcpChecksum = 1;
+    csumInfo.Transmit.IsIPv4 = 1;
+    csumInfo.Transmit.TcpHeaderOffset = sizeof *outerEthHdr +
+                                        outerIpHdr->ihl * 4;
+    NET_BUFFER_LIST_INFO(curNbl,
+                         TcpIpChecksumNetBufferListInfo) = csumInfo.Value;
 
     return STATUS_SUCCESS;
 
@@ -293,6 +332,53 @@
 }
 
 /*
+ *----------------------------------------------------------------------------
+ * OvsCalculateTCPChecksum
+ *     Calculate TCP checksum
+ *----------------------------------------------------------------------------
+ */
+static __inline NDIS_STATUS
+OvsCalculateTCPChecksum(PNET_BUFFER_LIST curNbl, PNET_BUFFER curNb)
+{
+    NDIS_TCP_IP_CHECKSUM_NET_BUFFER_LIST_INFO csumInfo;
+    csumInfo.Value = NET_BUFFER_LIST_INFO(curNbl,
+                                          TcpIpChecksumNetBufferListInfo);
+    UINT16 checkSum;
+
+    /* Check if TCP Checksum has been calculated by NIC */
+    if (csumInfo.Receive.TcpChecksumSucceeded) {
+        return NDIS_STATUS_SUCCESS;
+    }
+        
+    EthHdr *eth = (EthHdr *)NdisGetDataBuffer(curNb, sizeof(EthHdr),
+                                              NULL, 1, 0);
+
+    if (eth->Type == ntohs(NDIS_ETH_TYPE_IPV4)) {
+        IPHdr *ip = (IPHdr *)((PCHAR)eth + sizeof *eth);
+        UINT32 l4Payload = ntohs(ip->tot_len) - ip->ihl * 4;
+        TCPHdr *tcp = (TCPHdr *)((PCHAR)ip + ip->ihl * 4);
+        checkSum = tcp->check;
+
+        tcp->check = 0;
+        tcp->check = IPPseudoChecksum(&ip->saddr, &ip->daddr,
+                                      IPPROTO_TCP, (UINT16)l4Payload);
+        tcp->check = CalculateChecksumNB(curNb, (UINT16)(l4Payload),
+                                         sizeof(EthHdr) + ip->ihl * 4);
+        if (checkSum != tcp->check) {
+            return NDIS_STATUS_INVALID_PACKET;
+        }
+    } else {
+        OVS_LOG_ERROR("IPv6 on STT is not supported");
+        return NDIS_STATUS_INVALID_PACKET;
+    }
+
+    csumInfo.Receive.TcpChecksumSucceeded = 1;
+    NET_BUFFER_LIST_INFO(curNbl,
+                         TcpIpChecksumNetBufferListInfo) = csumInfo.Value;
+    return NDIS_STATUS_SUCCESS;
+}
+
+/*
  * --------------------------------------------------------------------------
  * OvsDecapStt --
  *     Decapsulates an STT packet.
@@ -311,6 +397,7 @@
     SttHdr *sttHdr;
     char *sttBuf[STT_HDR_LEN];
     UINT32 advanceCnt, hdrLen;
+    NDIS_TCP_IP_CHECKSUM_NET_BUFFER_LIST_INFO csumInfo;
 
     curNb = NET_BUFFER_LIST_FIRST_NB(curNbl);
     ASSERT(NET_BUFFER_NEXT_NB(curNb) == NULL);
@@ -321,6 +408,21 @@
         return NDIS_STATUS_INVALID_LENGTH;
     }
 
+    /* Verify outer TCP Checksum */
+    csumInfo.Value = NET_BUFFER_LIST_INFO(curNbl,
+                                          TcpIpChecksumNetBufferListInfo);
+
+    /* Check if NIC has indicated TCP checksum failure */
+    if (csumInfo.Receive.TcpChecksumFailed) {
+        return NDIS_STATUS_INVALID_PACKET;
+    }
+    
+    /* Calculate the TCP Checksum */
+    status = OvsCalculateTCPChecksum(curNbl, curNb);
+    if (status != NDIS_STATUS_SUCCESS) {
+        return status;
+    }
+
     /* Skip Eth header */
     hdrLen = sizeof(EthHdr);
     NdisAdvanceNetBufferDataStart(curNb, hdrLen, FALSE, NULL);
@@ -353,6 +455,61 @@
     hdrLen = STT_HDR_LEN;
     NdisAdvanceNetBufferDataStart(curNb, hdrLen, FALSE, NULL);
     advanceCnt += hdrLen;
+    
+    /* Verify checksum for inner packet if it's required */
+    if (!(sttHdr->flags & STT_CSUM_VERIFIED)) {
+        BOOLEAN innerChecksumPartial = sttHdr->flags & STT_CSUM_PARTIAL;
+        EthHdr *eth = (EthHdr *)NdisGetDataBuffer(curNb, sizeof(EthHdr),
+                                                  NULL, 1, 0);
+
+        /* XXX Figure out a way to offload checksum receives */
+        if (eth->Type == ntohs(NDIS_ETH_TYPE_IPV4)) {
+            IPHdr *ip = (IPHdr *)((PCHAR)eth + sizeof *eth);
+            UINT16 l4Payload = (UINT16)ntohs(ip->tot_len) - ip->ihl * 4;
+            UINT32 offset = sizeof(EthHdr) + ip->ihl * 4;
+
+            if (ip->protocol == IPPROTO_TCP) {
+                TCPHdr *tcp = (TCPHdr *)((PCHAR)ip + ip->ihl * 4);
+                if (!innerChecksumPartial){
+                    tcp->check = IPPseudoChecksum(&ip->saddr, &ip->daddr,
+                                                  IPPROTO_TCP,
+                                                  (UINT16)l4Payload);
+                }
+                tcp->check = CalculateChecksumNB(curNb, l4Payload, offset);
+            } else if (ip->protocol == IPPROTO_UDP) {
+                UDPHdr *udp = (UDPHdr *)((PCHAR)ip + sizeof *ip);
+                if (!innerChecksumPartial){
+                    udp->check = IPPseudoChecksum(&ip->saddr, &ip->daddr,
+                                                  IPPROTO_UDP, l4Payload);
+                }
+                udp->check = CalculateChecksumNB(curNb, l4Payload, offset);
+            }
+        } else if (eth->Type == ntohs(NDIS_ETH_TYPE_IPV6)) {
+            IPv6Hdr *ip = (IPv6Hdr *)((PCHAR)eth + sizeof *eth);
+            UINT32 offset = (UINT32)(sizeof *eth + sizeof *ip);
+            UINT16 totalLength = (UINT16)ntohs(ip->payload_len);
+            if (ip->nexthdr == IPPROTO_TCP) {
+                TCPHdr *tcp = (TCPHdr *)((PCHAR)ip + sizeof *ip);
+                if (!innerChecksumPartial){
+                    tcp->check = IPv6PseudoChecksum((UINT32 *)&ip->saddr,
+                                                    (UINT32 *)&ip->daddr,
+                                                    IPPROTO_TCP, totalLength);
+                }
+                tcp->check = CalculateChecksumNB(curNb, totalLength, offset);
+            }
+            else if (ip->nexthdr == IPPROTO_UDP) {
+                UDPHdr *udp = (UDPHdr *)((PCHAR)ip + sizeof *ip);
+                if (!innerChecksumPartial) {
+                    udp->check = IPv6PseudoChecksum((UINT32 *)&ip->saddr,
+                                                    (UINT32 *)&ip->daddr,
+                                                    IPPROTO_UDP, totalLength);
+                }
+                udp->check = CalculateChecksumNB(curNb, totalLength, offset);
+            }
+        }
+
+        NET_BUFFER_LIST_INFO(curNbl, TcpIpChecksumNetBufferListInfo) = 0;
+    }
 
     *newNbl = OvsPartialCopyNBL(switchContext, curNbl, OVS_DEFAULT_COPY_SIZE,
                                 0, FALSE /*copy NBL info*/);
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/Tunnel.c openvswitch-2.4.1/datapath-windows/ovsext/Tunnel.c
--- openvswitch-2.4.0/datapath-windows/ovsext/Tunnel.c	2015-08-11 20:38:17.375290517 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/Tunnel.c	2016-03-22 13:09:54.398615283 +0000
@@ -309,8 +309,8 @@
             datapath->hits++;
 
             OvsActionsExecute(gOvsSwitchContext, &completionList, pNbl,
-                            portNo, SendFlags, &key, &hash, &layers,
-                            flow->actions, flow->actionsLen);
+                              portNo, SendFlags, &key, &hash, &layers,
+                              flow->actions, flow->actionsLen);
 
             OvsReleaseDatapath(datapath, &dpLockState);
         } else {
@@ -318,8 +318,8 @@
 
             datapath->misses++;
             elem = OvsCreateQueueNlPacket(NULL, 0, OVS_PACKET_CMD_MISS,
-                                        portNo, &key, pNbl, curNb,
-                                        TRUE, &layers);
+                                          vport, &key, pNbl, curNb,
+                                          TRUE, &layers);
             if (elem) {
                 /* Complete the packet since it was copied to user buffer. */
                 InsertTailList(&missedPackets, &elem->link);
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/TunnelFilter.c openvswitch-2.4.1/datapath-windows/ovsext/TunnelFilter.c
--- openvswitch-2.4.0/datapath-windows/ovsext/TunnelFilter.c	2015-08-20 00:33:42.724962487 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/TunnelFilter.c	2016-03-22 13:09:54.398615283 +0000
@@ -121,7 +121,7 @@
         UINT64                  delID;
         /* Pointer used to return filter ID to the caller on filter creation. */
         PUINT64                 addID;
-    }filterID;
+    } filterID;
     /* Requested operation to be performed. */
     OVS_TUNFLT_OPERATION    operation;
     /* Current I/O request to be completed when requested
@@ -147,6 +147,8 @@
 typedef struct _OVS_TUNFLT_THREAD_CONTEXT {
     /* Thread identification. */
     UINT                    threadID;
+    /* Thread initialization flag. */
+    UINT32                  isInitialized;
     /* Thread's engine session handle. */
     HANDLE                  engineSession;
     /* Reference of the thread object. */
@@ -168,6 +170,10 @@
                                           BOOLEAN signalEvent);
 static NTSTATUS OvsTunnelFilterThreadInit(POVS_TUNFLT_THREAD_CONTEXT threadCtx);
 static VOID     OvsTunnelFilterThreadUninit(POVS_TUNFLT_THREAD_CONTEXT threadCtx);
+static VOID     OvsTunnelFilterSetIrpContext(POVS_TUNFLT_REQUEST_LIST listRequests,
+                                             POVS_TUNFLT_REQUEST request);
+static VOID     OvsTunnelFilterCancelIrp(PDEVICE_OBJECT DeviceObject,
+                                         PIRP Irp);
 
 /*
  * Callout driver global variables
@@ -825,20 +831,24 @@
 {
     NTSTATUS status = STATUS_SUCCESS;
 
-    status = OvsSubscribeTunnelInitBfeStateChanges(driverObject, deviceObject);
-    if (NT_SUCCESS(status)) {
-        if (FWPM_SERVICE_RUNNING == FwpmBfeStateGet()) {
-            status = OvsTunnelFilterInitialize(driverObject);
-            if (!NT_SUCCESS(status)) {
-                /* XXX: We need to decide what actions to take in case of
-                 * failure to initialize tunnel filter. */
-                ASSERT(status == NDIS_STATUS_SUCCESS);
-                OVS_LOG_ERROR(
-                    "Failed to initialize tunnel filter, status: %x.",
-                    status);
+    if (deviceObject) {
+        status = OvsSubscribeTunnelInitBfeStateChanges(driverObject, deviceObject);
+        if (NT_SUCCESS(status)) {
+            if (FWPM_SERVICE_RUNNING == FwpmBfeStateGet()) {
+                status = OvsTunnelFilterInitialize(driverObject);
+                if (!NT_SUCCESS(status)) {
+                    /* XXX: We need to decide what actions to take in case of
+                     * failure to initialize tunnel filter. */
+                    ASSERT(status == NDIS_STATUS_SUCCESS);
+                    OVS_LOG_ERROR(
+                        "Failed to initialize tunnel filter, status: %x.",
+                        status);
+                }
+                OvsUnsubscribeTunnelInitBfeStateChanges();
             }
-            OvsUnsubscribeTunnelInitBfeStateChanges();
         }
+    } else {
+        status = OvsTunnelFilterInitialize(driverObject);
     }
 
     return status;
@@ -951,56 +961,130 @@
 
 /*
  * --------------------------------------------------------------------------
- * This function pops the whole request entries from the queue and returns the
- * number of entries through the 'count' parameter. The operation is
- * synchronized using request list spinlock.
+ * This function pops the head request from the queue while holding the
+ * queue lock. If the request has already been cancelled or is about to be
+ * cancelled, the function retrieves the next valid request.
+ *
+ * Returns a pointer to the OVS_TUNFLT_REQUEST_LIST request object retrieved
+ * from the queue.
  * --------------------------------------------------------------------------
  */
-VOID
-OvsTunnelFilterRequestPopList(POVS_TUNFLT_REQUEST_LIST listRequests,
-                              PLIST_ENTRY head,
-                              UINT32 *count)
+POVS_TUNFLT_REQUEST
+OvsTunnelFilterRequestPop(POVS_TUNFLT_REQUEST_LIST listRequests)
 {
+    POVS_TUNFLT_REQUEST request = NULL;
+    PLIST_ENTRY         link, next, head;
+
     NdisAcquireSpinLock(&listRequests->spinlock);
 
     if (!IsListEmpty(&listRequests->head)) {
-        PLIST_ENTRY PrevEntry;
-        PLIST_ENTRY NextEntry;
-
-        NextEntry = listRequests->head.Flink;
-        PrevEntry = listRequests->head.Blink;
-
-        head->Flink = NextEntry;
-        NextEntry->Blink = head;
-
-        head->Blink = PrevEntry;
-        PrevEntry->Flink = head;
+        head = &listRequests->head;
+        LIST_FORALL_SAFE(head, link, next) {
+            PDRIVER_CANCEL oldCancelRoutine;
 
-        *count = listRequests->numEntries;
+            request = CONTAINING_RECORD(link, OVS_TUNFLT_REQUEST, entry);
+            if (request->irp) {
+                oldCancelRoutine = IoSetCancelRoutine(request->irp, NULL);
+                if (oldCancelRoutine == NULL) {
+                    /*
+                     * The Cancel routine for the current IRP is running. The
+                     * request is to be completed by the Cancel routine. Leave
+                     * this request alone and go to the next one.
+                     */
+                    continue;
+                } else {
+                    /*
+                     * The Cancel routine cannot run now and cannot already have
+                     * started to run. This request can be processed.
+                     */
+                }
+            }
 
-        InitializeListHead(&listRequests->head);
-        listRequests->numEntries = 0;
+            RemoveEntryList(&request->entry);
+            listRequests->numEntries--;
+            break;
+        }
     }
 
     NdisReleaseSpinLock(&listRequests->spinlock);
+
+    return request;
 }
 
 /*
  * --------------------------------------------------------------------------
- * This function pushes the received request to the list while holding the
- * request list spinlock.
+ * This function pushes the received request to the queue, marks the IRP as
+ * pending and sets its Cancel routine, while holding the queue lock.
+ *
+ * Returns STATUS_CANCELLED if the IRP has already been cancelled. Otherwise,
+ * STATUS_SUCCESS is returned.
  * --------------------------------------------------------------------------
  */
-VOID
+NTSTATUS
 OvsTunnelFilterRequestPush(POVS_TUNFLT_REQUEST_LIST listRequests,
                            POVS_TUNFLT_REQUEST request)
 {
+    NTSTATUS status = STATUS_SUCCESS;
+    PIRP irp = request->irp;
+    PDRIVER_CANCEL oldCancelRoutine;
+    BOOLEAN cancelled = FALSE;
+
     NdisAcquireSpinLock(&listRequests->spinlock);
 
-    InsertTailList(&listRequests->head, &(request->entry));
-    listRequests->numEntries++;
+    if (irp) {
+        /*
+         * Mark the IRP pending to indicate that the request may complete on
+         * a different thread.
+         */
+        IoMarkIrpPending(irp);
+
+        /*
+         * Set the Cancel routine for the pending IRP, before checking the
+         * Cancel flag.
+         */
+        oldCancelRoutine = IoSetCancelRoutine(irp, OvsTunnelFilterCancelIrp);
+        ASSERT(oldCancelRoutine == NULL);
+
+        if (irp->Cancel) {
+            /*
+             * The IRP has already been cancelled.
+             * Determine wheather the Cancel routine has started to run.
+             */
+            oldCancelRoutine = IoSetCancelRoutine(irp, NULL);
+            if (oldCancelRoutine) {
+                /*
+                 * The I/O Manager has not called the Cancel routine and it
+                 * won't be called anymore, because we just set it to NULL.
+                 * Return STATUS_CANCELLED and complete the request after
+                 * releasing the lock.
+                 */
+                status = STATUS_CANCELLED;
+                cancelled = TRUE;
+            } else {
+                /*
+                 * The Cancel routine has already started to run, but it is
+                 * blocked while it waits for the queue lock. Release the lock
+                 * and return STATUS_SUCCESS to avoid completing the request.
+                 * It will be completed in the Cancel routine.
+                 */
+            }
+        } else {
+            /*
+             * The IRP has not been cancelled, so set its context used in the
+             * Cancel routine.
+             */
+            OvsTunnelFilterSetIrpContext(listRequests, request);
+        }
+    }
+
+    if (!cancelled) {
+        InsertTailList(&listRequests->head, &(request->entry));
+        listRequests->numEntries++;
+    }
 
     NdisReleaseSpinLock(&listRequests->spinlock);
+
+    return status;
 }
 
 /*
@@ -1009,24 +1093,45 @@
  * request queue. The arrival of the new request is signaled to the thread,
  * in order to start processing it.
  *
+ * Note:
+ * If the thread is not initialized, no operation is performed.
+ *
  * For a uniform distribution of requests to thread queues, a thread index is
  * calculated based on the received destination port.
  * --------------------------------------------------------------------------
  */
-VOID
+NTSTATUS
 OvsTunnelFilterThreadPush(POVS_TUNFLT_REQUEST request)
 {
+    NTSTATUS status = STATUS_REQUEST_ABORTED;
+    UINT32 count = OVS_TUNFLT_MAX_THREADS;
     UINT32 threadIndex;
 
     threadIndex = request->port % OVS_TUNFLT_MAX_THREADS;
 
-    OvsTunnelFilterRequestPush(
-        &gTunnelThreadCtx[threadIndex].listRequests,
-        request);
-
-    KeSetEvent(&gTunnelThreadCtx[threadIndex].requestEvent,
-               IO_NO_INCREMENT,
-               FALSE);
+    while (count--) {
+        if (gTunnelThreadCtx[threadIndex].isInitialized) {
+
+            status = OvsTunnelFilterRequestPush(
+                &gTunnelThreadCtx[threadIndex].listRequests,
+                request);
+
+            if (NT_SUCCESS(status)) {
+                KeSetEvent(&gTunnelThreadCtx[threadIndex].requestEvent,
+                           IO_NO_INCREMENT,
+                           FALSE);
+            }
+
+            break;
+        } else {
+            OVS_LOG_INFO("OVS tunnel filter thread %d not initialized.",
+                         threadIndex);
+        }
+
+        threadIndex = (threadIndex + 1) % OVS_TUNFLT_MAX_THREADS;
+    }
+
+    return status;
 }
 
 VOID
@@ -1052,16 +1157,10 @@
 OvsTunnelFilterRequestListProcess(POVS_TUNFLT_THREAD_CONTEXT threadCtx)
 {
     POVS_TUNFLT_REQUEST request = NULL;
-    PLIST_ENTRY         link = NULL;
-    PLIST_ENTRY         next = NULL;
-    LIST_ENTRY          head;
     NTSTATUS            status = STATUS_SUCCESS;
-    UINT32              count = 0;
     BOOLEAN             inTransaction = FALSE;
-    BOOLEAN             error = TRUE;
 
-    do
-    {
+    do {
         if (!InterlockedCompareExchange(
             (LONG volatile *)&threadCtx->listRequests.numEntries, 0, 0)) {
             OVS_LOG_INFO("Nothing to do... request list is empty.");
@@ -1076,38 +1175,24 @@
         }
         inTransaction = TRUE;
 
-        InitializeListHead(&head);
-        OvsTunnelFilterRequestPopList(&threadCtx->listRequests, &head, &count);
-
-        LIST_FORALL_SAFE(&head, link, next) {
-            request = CONTAINING_RECORD(link, OVS_TUNFLT_REQUEST, entry);
+        while (NULL !=
+            (request = OvsTunnelFilterRequestPop(&threadCtx->listRequests))) {
 
             status = OvsTunnelFilterExecuteAction(threadCtx->engineSession,
                                                   request);
-            if (!NT_SUCCESS(status)) {
-                RemoveEntryList(&request->entry);
-                count--;
-
-                /* Complete the IRP with the failure status. */
-                OvsTunnelFilterCompleteRequest(request->irp,
-                                               request->callback,
-                                               request->context,
-                                               status);
-                OvsFreeMemory(request);
-                request = NULL;
-            } else {
-                error = FALSE;
-            }
-        }
 
-        if (error) {
-            /* No successful requests were made, so there is no point to commit
-             * the transaction. */
-            break;
+            /* Complete the IRP with the last operation status. */
+            OvsTunnelFilterCompleteRequest(request->irp,
+                                           request->callback,
+                                           request->context,
+                                           status);
+
+            OvsFreeMemory(request);
+            request = NULL;
         }
 
         status = FwpmTransactionCommit(threadCtx->engineSession);
-        if (!NT_SUCCESS(status)){
+        if (!NT_SUCCESS(status)) {
             OVS_LOG_ERROR("Failed to commit transaction, status: %x.",
                           status);
             break;
@@ -1121,20 +1206,6 @@
         OVS_LOG_ERROR("Failed to execute request, status: %x.\
                        Transaction aborted.", status);
     }
-
-    /* Complete the requests successfully executed with the transaction commit
-     * status. */
-    while (count) {
-        request = (POVS_TUNFLT_REQUEST)RemoveHeadList(&head);
-        count--;
-
-        OvsTunnelFilterCompleteRequest(request->irp,
-                                       request->callback,
-                                       request->context,
-                                       status);
-        OvsFreeMemory(request);
-        request = NULL;
-    }
 }
 
 /*
@@ -1190,7 +1261,7 @@
                     OvsTunnelFilterRequestListProcess(threadCtx);
                     break;
                 default:
-                    /* Finish processing the received requests and exit. */
+                    /* Finish processing the remaining requests and exit. */
                     OvsTunnelFilterRequestListProcess(threadCtx);
                     exit = TRUE;
                     break;
@@ -1280,20 +1351,23 @@
 OvsTunnelFilterThreadStop(POVS_TUNFLT_THREAD_CONTEXT threadCtx,
                           BOOLEAN signalEvent)
 {
-    if (signalEvent) {
-        /* Signal stop thread event. */
-        OVS_LOG_INFO("Received stop event for OVS Tunnel system thread %d.",
-                     threadCtx->threadID);
-        KeSetEvent(&threadCtx->stopEvent, IO_NO_INCREMENT, FALSE);
-    } else {
-        /* Wait for the tunnel thread to finish. */
-        KeWaitForSingleObject(threadCtx->threadObject,
-                              Executive,
-                              KernelMode,
-                              FALSE,
-                              NULL);
+    if (threadCtx->isInitialized) {
 
-        ObDereferenceObject(threadCtx->threadObject);
+        if (signalEvent) {
+            /* Signal stop thread event. */
+            OVS_LOG_INFO("Received stop event for OVS Tunnel system thread %d.",
+                         threadCtx->threadID);
+            KeSetEvent(&threadCtx->stopEvent, IO_NO_INCREMENT, FALSE);
+        } else {
+            /* Wait for the tunnel thread to finish. */
+            KeWaitForSingleObject(threadCtx->threadObject,
+                                  Executive,
+                                  KernelMode,
+                                  FALSE,
+                                  NULL);
+
+            ObDereferenceObject(threadCtx->threadObject);
+        }
     }
 }
 
@@ -1329,6 +1403,8 @@
             SynchronizationEvent,
             FALSE);
 
+        threadCtx->isInitialized = TRUE;
+
         error = FALSE;
     } while (error);
 
@@ -1349,6 +1425,8 @@
         OvsTunnelEngineClose(&threadCtx->engineSession);
 
         NdisFreeSpinLock(&threadCtx->listRequests.spinlock);
+
+        threadCtx->isInitialized = FALSE;
     }
 }
 
@@ -1356,7 +1434,7 @@
  * --------------------------------------------------------------------------
  * This function creates a new tunnel filter request and push it to a thread
  * queue. If the thread stop event is signaled, the request is completed with
- * STATUS_CANCELLED without pushing it to any queue.
+ * STATUS_REQUEST_ABORTED without pushing it to any queue.
  * --------------------------------------------------------------------------
  */
 NTSTATUS
@@ -1369,6 +1447,7 @@
 {
     POVS_TUNFLT_REQUEST request = NULL;
     NTSTATUS            status = STATUS_PENDING;
+    NTSTATUS            result = STATUS_SUCCESS;
     BOOLEAN             error = TRUE;
     UINT64              timeout = 0;
 
@@ -1381,8 +1460,8 @@
                                   FALSE,
                                   (LARGE_INTEGER *)&timeout)) {
             /* The stop event is signaled. Completed the IRP with
-             * STATUS_CANCELLED. */
-            status = STATUS_CANCELLED;
+             * STATUS_REQUEST_ABORTED. */
+            status = STATUS_REQUEST_ABORTED;
             break;
         }
 
@@ -1392,7 +1471,9 @@
             break;
         }
 
-        request = (POVS_TUNFLT_REQUEST) OvsAllocateMemory(sizeof(*request));
+        request = (POVS_TUNFLT_REQUEST)
+            OvsAllocateMemoryWithTag(sizeof(*request),
+                                     OVS_TUNFLT_POOL_TAG);
         if (NULL == request) {
             OVS_LOG_ERROR("Failed to allocate list item.");
             status = STATUS_INSUFFICIENT_RESOURCES;
@@ -1413,12 +1494,20 @@
         request->callback = callback;
         request->context = tunnelContext;
 
-        OvsTunnelFilterThreadPush(request);
+        result = OvsTunnelFilterThreadPush(request);
+        if (!NT_SUCCESS(result)) {
+            status = result;
+            break;
+        }
 
         error = FALSE;
     } while (error);
 
     if (error) {
+        OvsTunnelFilterCompleteRequest(irp,
+                                       callback,
+                                       tunnelContext,
+                                       status);
         if (request) {
             OvsFreeMemory(request);
             request = NULL;
@@ -1505,3 +1594,64 @@
                                        callback,
                                        tunnelContext);
 }
+
+/*
+ * --------------------------------------------------------------------------
+ * This function sets the context for the IRP. The context is used by the
+ * Cancel routine, in order to identify the request object, corresponding to
+ * the IRP, to be completed and to have access to the queue lock to remove
+ * the request link from the queue.
+ * --------------------------------------------------------------------------
+ */
+VOID
+OvsTunnelFilterSetIrpContext(POVS_TUNFLT_REQUEST_LIST listRequests,
+                             POVS_TUNFLT_REQUEST request)
+{
+    PIRP irp = request->irp;
+
+    if (irp) {
+        /* Set the IRP's DriverContext to be used for later. */
+        irp->Tail.Overlay.DriverContext[0] = (PVOID)request;
+        irp->Tail.Overlay.DriverContext[1] = (PVOID)listRequests;
+    }
+}
+
+/*
+ * --------------------------------------------------------------------------
+ * This function is the Cancel routine to be called by the I/O Manager in the
+ * case when the IRP is cancelled.
+ * --------------------------------------------------------------------------
+ */
+VOID
+OvsTunnelFilterCancelIrp(PDEVICE_OBJECT DeviceObject,
+                         PIRP irp)
+{
+    POVS_TUNFLT_REQUEST request =
+        (POVS_TUNFLT_REQUEST)irp->Tail.Overlay.DriverContext[0];
+    POVS_TUNFLT_REQUEST_LIST listRequests =
+        (POVS_TUNFLT_REQUEST_LIST)irp->Tail.Overlay.DriverContext[1];
+
+    DBG_UNREFERENCED_PARAMETER(DeviceObject);
+
+    /* Release the global cancel spinlock. */
+    IoReleaseCancelSpinLock(irp->CancelIrql);
+
+    /* Clear the cancel routine from the IRP. */
+    IoSetCancelRoutine(irp, NULL);
+
+    NdisAcquireSpinLock(&listRequests->spinlock);
+
+    /* Remove the request from the corresponding tunnel filter thread queue. */
+    RemoveEntryList(&request->entry);
+    listRequests->numEntries--;
+
+    NdisReleaseSpinLock(&listRequests->spinlock);
+
+    /* We are done with this IRP, so complete it with STATUS_CANCELLED. */
+    OvsTunnelFilterCompleteRequest(request->irp,
+                                   request->callback,
+                                   request->context,
+                                   STATUS_CANCELLED);
+
+    OvsFreeMemory(request);
+}
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/User.c openvswitch-2.4.1/datapath-windows/ovsext/User.c
--- openvswitch-2.4.0/datapath-windows/ovsext/User.c	2015-08-21 00:18:20.958479287 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/User.c	2016-03-22 13:09:54.398615283 +0000
@@ -48,6 +48,7 @@
 static VOID _MapNlAttrToOvsPktExec(PNL_ATTR *nlAttrs, PNL_ATTR *keyAttrs,
                                    OvsPacketExecute  *execute);
 extern NL_POLICY nlFlowKeyPolicy[];
+extern UINT32 nlFlowKeyPolicyLen;
 
 static __inline VOID
 OvsAcquirePidHashLock()
@@ -339,7 +340,8 @@
 
     /* Get all the top level Flow attributes */
     if ((NlAttrParse(nlMsgHdr, attrOffset, NlMsgAttrsLen(nlMsgHdr),
-                     nlPktExecPolicy, nlAttrs, ARRAY_SIZE(nlAttrs)))
+                     nlPktExecPolicy, ARRAY_SIZE(nlPktExecPolicy),
+                     nlAttrs, ARRAY_SIZE(nlAttrs)))
                      != TRUE) {
         OVS_LOG_ERROR("Attr Parsing failed for msg: %p",
                        nlMsgHdr);
@@ -353,8 +355,8 @@
     /* Get flow keys attributes */
     if ((NlAttrParseNested(nlMsgHdr, keyAttrOffset,
                            NlAttrLen(nlAttrs[OVS_PACKET_ATTR_KEY]),
-                           nlFlowKeyPolicy, keyAttrs,
-                           ARRAY_SIZE(keyAttrs))) != TRUE) {
+                           nlFlowKeyPolicy, nlFlowKeyPolicyLen,
+                           keyAttrs, ARRAY_SIZE(keyAttrs))) != TRUE) {
         OVS_LOG_ERROR("Key Attr Parsing failed for msg: %p", nlMsgHdr);
         status = STATUS_UNSUCCESSFUL;
         goto done;
@@ -770,7 +772,7 @@
 OvsCreateAndAddPackets(PVOID userData,
                        UINT32 userDataLen,
                        UINT32 cmd,
-                       UINT32 inPort,
+                       POVS_VPORT_ENTRY vport,
                        OvsFlowKey *key,
                        PNET_BUFFER_LIST nbl,
                        BOOLEAN isRecv,
@@ -807,7 +809,7 @@
     nb = NET_BUFFER_LIST_FIRST_NB(nbl);
     while (nb) {
         elem = OvsCreateQueueNlPacket(userData, userDataLen,
-                                    cmd, inPort, key, nbl, nb,
+                                    cmd, vport, key, nbl, nb,
                                     isRecv, hdrInfo);
         if (elem) {
             InsertTailList(list, &elem->link);
@@ -986,7 +988,7 @@
 OvsCreateQueueNlPacket(PVOID userData,
                        UINT32 userDataLen,
                        UINT32 cmd,
-                       UINT32 inPort,
+                       POVS_VPORT_ENTRY vport,
                        OvsFlowKey *key,
                        PNET_BUFFER_LIST nbl,
                        PNET_BUFFER nb,
@@ -1005,10 +1007,6 @@
     NL_BUFFER nlBuf;
     PNL_MSG_HDR nlMsg;
 
-    /* XXX pass vport in the stack rather than portNo */
-    POVS_VPORT_ENTRY vport =
-        OvsFindVportByPortNo(gOvsSwitchContext, inPort);
-
     if (vport == NULL){
         /* No vport is not fatal. */
         return NULL;
@@ -1060,7 +1058,7 @@
     elem->packet.queue = 0;
     /* XXX  no need as the length is already in the NL attrib */
     elem->packet.userDataLen = userDataLen;
-    elem->packet.inPort = inPort;
+    elem->packet.inPort = vport->portNo;
     elem->packet.cmd = cmd;
     if (cmd == (UINT32)OVS_PACKET_CMD_MISS) {
         ovsUserStats.miss++;
@@ -1154,3 +1152,111 @@
     OvsFreeMemoryWithTag(elem, OVS_USER_POOL_TAG);
     return NULL;
 }
+
+/*
+ * --------------------------------------------------------------------------
+ *  Handler for the subscription for a packet queue
+ * --------------------------------------------------------------------------
+ */
+NTSTATUS
+OvsSubscribePacketCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
+                            UINT32 *replyLen)
+{
+    NDIS_STATUS status;
+    BOOLEAN rc;
+    UINT8 join;
+    UINT32 pid;
+    const NL_POLICY policy[] =  {
+        [OVS_NL_ATTR_PACKET_PID] = {.type = NL_A_U32 },
+        [OVS_NL_ATTR_PACKET_SUBSCRIBE] = {.type = NL_A_U8 }
+        };
+    PNL_ATTR attrs[ARRAY_SIZE(policy)];
+
+    UNREFERENCED_PARAMETER(replyLen);
+
+    POVS_OPEN_INSTANCE instance =
+        (POVS_OPEN_INSTANCE)usrParamsCtx->ovsInstance;
+    POVS_MESSAGE msgIn = (POVS_MESSAGE)usrParamsCtx->inputBuffer;
+
+    rc = NlAttrParse(&msgIn->nlMsg, sizeof (*msgIn),
+         NlMsgAttrsLen((PNL_MSG_HDR)msgIn), policy, ARRAY_SIZE(policy),
+                       attrs, ARRAY_SIZE(attrs));
+    if (!rc) {
+        status = STATUS_INVALID_PARAMETER;
+        goto done;
+    }
+
+    join = NlAttrGetU8(attrs[OVS_NL_ATTR_PACKET_PID]);
+    pid = NlAttrGetU32(attrs[OVS_NL_ATTR_PACKET_PID]);
+
+    /* The socket subscribed with must be the same socket we perform receive*/
+    ASSERT(pid == instance->pid);
+
+    status = OvsSubscribeDpIoctl(instance, pid, join);
+
+    /*
+     * XXX Need to add this instance to a global data structure
+     * which hold all packet based instances. The data structure (hash)
+     * should be searched through the pid field of the instance for
+     * placing the missed packet into the correct queue
+     */
+done:
+    return status;
+}
+
+/*
+ * --------------------------------------------------------------------------
+ * Handler for queueing an IRP used for missed packet notification. The IRP is
+ * completed when a packet received and mismatched. STATUS_PENDING is returned
+ * on success. User mode keep a pending IRP at all times.
+ * --------------------------------------------------------------------------
+ */
+NTSTATUS
+OvsPendPacketCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
+                       UINT32 *replyLen)
+{
+    UNREFERENCED_PARAMETER(replyLen);
+
+    POVS_OPEN_INSTANCE instance =
+        (POVS_OPEN_INSTANCE)usrParamsCtx->ovsInstance;
+
+    /*
+     * XXX access to packet queue must be through acquiring a lock as user mode
+     * could unsubscribe and the instnace will be freed.
+     */
+    return OvsWaitDpIoctl(usrParamsCtx->irp, instance->fileObject);
+}
+
+/*
+ * --------------------------------------------------------------------------
+ * Handler for reading missed pacckets from the driver event queue. This
+ * handler is executed when user modes issues a socket receive on a socket
+ * --------------------------------------------------------------------------
+ */
+NTSTATUS
+OvsReadPacketCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
+                       UINT32 *replyLen)
+{
+#ifdef DBG
+    POVS_MESSAGE msgOut = (POVS_MESSAGE)usrParamsCtx->outputBuffer;
+#endif
+    POVS_OPEN_INSTANCE instance =
+        (POVS_OPEN_INSTANCE)usrParamsCtx->ovsInstance;
+    NTSTATUS status;
+
+    ASSERT(usrParamsCtx->devOp == OVS_READ_DEV_OP);
+
+    /* Should never read events with a dump socket */
+    ASSERT(instance->dumpState.ovsMsg == NULL);
+
+    /* Must have an packet queue */
+    ASSERT(instance->packetQueue != NULL);
+
+    /* Output buffer has been validated while validating read dev op. */
+    ASSERT(msgOut != NULL && usrParamsCtx->outputLength >= sizeof *msgOut);
+
+    /* Read a packet from the instance queue */
+    status = OvsReadDpIoctl(instance->fileObject, usrParamsCtx->outputBuffer,
+                            usrParamsCtx->outputLength, replyLen);
+    return status;
+}
\ No newline at end of file
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/User.h openvswitch-2.4.1/datapath-windows/ovsext/User.h
--- openvswitch-2.4.0/datapath-windows/ovsext/User.h	2015-08-11 20:38:17.387290945 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/User.h	2016-03-22 13:09:54.398615283 +0000
@@ -72,7 +72,8 @@
 
 POVS_PACKET_QUEUE_ELEM OvsCreateQueueNlPacket(PVOID userData,
                                               UINT32 userDataLen,
-                                              UINT32 cmd, UINT32 inPort,
+                                              UINT32 cmd, 
+                                              POVS_VPORT_ENTRY vport,
                                               OvsFlowKey *key,
                                               PNET_BUFFER_LIST nbl,
                                               PNET_BUFFER nb,
@@ -83,7 +84,7 @@
 NTSTATUS OvsCreateAndAddPackets(PVOID userData,
                                 UINT32 userDataLen,
                                 UINT32 cmd,
-                                UINT32 inPort,
+                                POVS_VPORT_ENTRY vport,
                                 OvsFlowKey *key,
                                 PNET_BUFFER_LIST nbl,
                                 BOOLEAN isRecv,
@@ -118,4 +119,11 @@
 VOID
 OvsDelPidInstance(POVS_SWITCH_CONTEXT switchContext, UINT32 pid);
 
+NTSTATUS OvsReadPacketCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
+                                 UINT32 *replyLen);
+NTSTATUS OvsSubscribePacketCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
+                                      UINT32 *replyLen);
+NTSTATUS OvsPendPacketCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
+                                 UINT32 *replyLen);
+
 #endif /* __USER_H_ */
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/Util.h openvswitch-2.4.1/datapath-windows/ovsext/Util.h
--- openvswitch-2.4.0/datapath-windows/ovsext/Util.h	2015-08-20 00:33:42.736962969 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/Util.h	2016-03-22 13:09:54.398615283 +0000
@@ -34,6 +34,7 @@
 #define OVS_USER_POOL_TAG               'USVO'
 #define OVS_VPORT_POOL_TAG              'PSVO'
 #define OVS_STT_POOL_TAG                'RSVO'
+#define OVS_TUNFLT_POOL_TAG             'WSVO'
 
 VOID *OvsAllocateMemory(size_t size);
 VOID *OvsAllocateMemoryWithTag(size_t size, ULONG tag);
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/Vport.c openvswitch-2.4.1/datapath-windows/ovsext/Vport.c
--- openvswitch-2.4.0/datapath-windows/ovsext/Vport.c	2015-08-21 00:18:20.986479288 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/Vport.c	2016-03-22 13:09:54.398615283 +0000
@@ -95,7 +95,7 @@
 static VOID OvsTunnelVportPendingRemove(PVOID context,
                                         NTSTATUS status,
                                         UINT32 *replyLen);
-
+static VOID AssignNicNameSpecial(POVS_VPORT_ENTRY vport);
 
 /*
  * Functions implemented in relaton to NDIS port manipulation.
@@ -191,10 +191,8 @@
                                             portParam->PortId, 0);
     /*
      * Update properties only for NETDEV ports for supprting PS script
-     * We don't allow changing the names of the internal or external ports
      */
-    if (vport == NULL || (( vport->portType != NdisSwitchPortTypeSynthetic) &&
-        ( vport->portType != NdisSwitchPortTypeEmulated))) {
+    if (vport == NULL) {
         goto update_port_done;
     }
 
@@ -439,6 +437,7 @@
     case NdisSwitchNicTypeInternal:
         RtlCopyMemory(&vport->netCfgInstanceId, &nicParam->NetCfgInstanceId,
                       sizeof (GUID));
+        AssignNicNameSpecial(vport);
         break;
     case NdisSwitchNicTypeSynthetic:
     case NdisSwitchNicTypeEmulated:
@@ -970,36 +969,47 @@
 
 /*
  * --------------------------------------------------------------------------
- * For external vports 'portFriendlyName' provided by Hyper-V is over-written
- * by synthetic names.
+ * For external and internal vports 'portFriendlyName' parameter, provided by
+ * Hyper-V, is overwritten with the interface alias name.
  * --------------------------------------------------------------------------
  */
 static VOID
 AssignNicNameSpecial(POVS_VPORT_ENTRY vport)
 {
-    size_t len;
+    NTSTATUS status = STATUS_SUCCESS;
+    WCHAR interfaceName[IF_MAX_STRING_SIZE] = { 0 };
+    NET_LUID interfaceLuid = { 0 };
+    size_t len = 0;
 
-    if (vport->portType == NdisSwitchPortTypeExternal) {
-        if (vport->nicIndex == 0) {
-            ASSERT(vport->nicIndex == 0);
-            RtlStringCbPrintfW(vport->portFriendlyName.String,
-                               IF_MAX_STRING_SIZE,
-                               L"%s.virtualAdapter", OVS_DPPORT_EXTERNAL_NAME_W);
+    ASSERT(vport->portType == NdisSwitchPortTypeExternal || 
+           vport->portType == NdisSwitchPortTypeInternal);
+
+    status = ConvertInterfaceGuidToLuid(&vport->netCfgInstanceId,
+                                        &interfaceLuid);
+    if (status == STATUS_SUCCESS) {
+        status = ConvertInterfaceLuidToAlias(&interfaceLuid, interfaceName,
+                                             IF_MAX_STRING_SIZE + 1);
+        if (status == STATUS_SUCCESS) {
+            if (vport->portType == NdisSwitchPortTypeExternal &&
+                vport->nicIndex == 0) {
+                RtlStringCbPrintfW(vport->portFriendlyName.String, IF_MAX_STRING_SIZE,
+                                   L"%s.virtualAdapter", interfaceName);
+            } else {
+                RtlStringCbPrintfW(vport->portFriendlyName.String,
+                                   IF_MAX_STRING_SIZE, L"%s", interfaceName);
+            }
+
+            RtlStringCbLengthW(vport->portFriendlyName.String, IF_MAX_STRING_SIZE,
+                               &len);
+            vport->portFriendlyName.Length = (USHORT)len;
         } else {
-            RtlStringCbPrintfW(vport->portFriendlyName.String,
-                               IF_MAX_STRING_SIZE,
-                               L"%s.%lu", OVS_DPPORT_EXTERNAL_NAME_W,
-                               (UINT32)vport->nicIndex);
+            OVS_LOG_INFO("Fail to convert interface LUID to alias, status: %x",
+                status);
         }
     } else {
-        RtlStringCbPrintfW(vport->portFriendlyName.String,
-                           IF_MAX_STRING_SIZE,
-                           L"%s", OVS_DPPORT_INTERNAL_NAME_W);
+        OVS_LOG_INFO("Fail to convert interface GUID to LUID, status: %x",
+                      status);
     }
-
-    RtlStringCbLengthW(vport->portFriendlyName.String, IF_MAX_STRING_SIZE,
-                       &len);
-    vport->portFriendlyName.Length = (USHORT)len;
 }
 
 
@@ -1270,7 +1280,8 @@
     POVS_TUNFLT_INIT_CONTEXT tunnelContext = NULL;
     PIRP irp = NULL;
 
-    tunnelContext = OvsAllocateMemory(sizeof(*tunnelContext));
+    tunnelContext = OvsAllocateMemoryWithTag(sizeof(*tunnelContext),
+                                             OVS_VPORT_POOL_TAG);
     if (tunnelContext == NULL) {
         return STATUS_INSUFFICIENT_RESOURCES;
     }
@@ -1384,23 +1395,40 @@
             if (vport) {
                 OvsInitPhysNicVport(vport, virtExtVport,
                                     nicParam->NicIndex);
+                OvsInitVportWithNicParam(switchContext, vport, nicParam);
                 status = InitHvVportCommon(switchContext, vport, TRUE);
                 if (status != NDIS_STATUS_SUCCESS) {
                     OvsFreeMemoryWithTag(vport, OVS_VPORT_POOL_TAG);
                     vport = NULL;
                 }
+            } else {
+                OVS_LOG_ERROR("Fail to allocate vport.");
+                continue;
             }
         } else {
             vport = OvsFindVportByPortIdAndNicIndex(switchContext,
                                                     nicParam->PortId,
                                                     nicParam->NicIndex);
+            if (vport == NULL) {
+                OVS_LOG_ERROR(
+                    "Could not found vport with portId: %d and nicIndex: %d.",
+                    nicParam->PortId, nicParam->NicIndex);
+                continue;
+            }
+            OvsInitVportWithNicParam(switchContext, vport, nicParam);
         }
-        if (vport == NULL) {
-            OVS_LOG_ERROR("Fail to allocate vport");
-            continue;
-        }
-        OvsInitVportWithNicParam(switchContext, vport, nicParam);
+
         if (nicParam->NicType == NdisSwitchNicTypeInternal) {
+            /*
+             * Overwrite the 'portFriendlyName' of the internal vport. 
+             * Note:
+             * The call to AssignNicNameSpecial() is needed here, because the
+             * necessary 'netCfgInstanceId' of the vport is available.
+             * On port creation the latter information is missing and the
+             * 'portFriendlyName' of the vport fails to be overwritten with the
+             * correct information.
+             */
+            AssignNicNameSpecial(vport);
             OvsInternalAdapterUp(vport->portNo, &nicParam->NetCfgInstanceId);
         }
     }
@@ -1637,7 +1665,8 @@
     if (!NlAttrParse((PNL_MSG_HDR)msgIn,
         NLMSG_HDRLEN + GENL_HDRLEN + OVS_HDRLEN,
         NlMsgAttrsLen((PNL_MSG_HDR)msgIn),
-        ovsNetdevPolicy, netdevAttrs, ARRAY_SIZE(netdevAttrs))) {
+        ovsNetdevPolicy, ARRAY_SIZE(ovsNetdevPolicy),
+        netdevAttrs, ARRAY_SIZE(netdevAttrs))) {
         return STATUS_INVALID_PARAMETER;
     }
 
@@ -1977,7 +2006,8 @@
     if (!NlAttrParse((PNL_MSG_HDR)msgIn,
         NLMSG_HDRLEN + GENL_HDRLEN + OVS_HDRLEN,
         NlMsgAttrsLen((PNL_MSG_HDR)msgIn),
-        ovsVportPolicy, vportAttrs, ARRAY_SIZE(vportAttrs))) {
+        ovsVportPolicy, ARRAY_SIZE(ovsVportPolicy),
+        vportAttrs, ARRAY_SIZE(vportAttrs))) {
         return STATUS_INVALID_PARAMETER;
     }
 
@@ -2093,9 +2123,7 @@
     PCHAR portName;
     ULONG portNameLen;
     UINT32 portType;
-    BOOLEAN isBridgeInternal = FALSE;
     BOOLEAN vportAllocated = FALSE, vportInitialized = FALSE;
-    BOOLEAN addInternalPortAsNetdev = FALSE;
 
     static const NL_POLICY ovsVportPolicy[] = {
         [OVS_VPORT_ATTR_PORT_NO] = { .type = NL_A_U32, .optional = TRUE },
@@ -2118,7 +2146,8 @@
     if (!NlAttrParse((PNL_MSG_HDR)msgIn,
         NLMSG_HDRLEN + GENL_HDRLEN + OVS_HDRLEN,
         NlMsgAttrsLen((PNL_MSG_HDR)msgIn),
-        ovsVportPolicy, vportAttrs, ARRAY_SIZE(vportAttrs))) {
+        ovsVportPolicy, ARRAY_SIZE(ovsVportPolicy),
+        vportAttrs, ARRAY_SIZE(vportAttrs))) {
         return STATUS_INVALID_PARAMETER;
     }
 
@@ -2137,24 +2166,12 @@
         goto Cleanup;
     }
 
-    if (portName && portType == OVS_VPORT_TYPE_NETDEV &&
-        !strcmp(OVS_DPPORT_INTERNAL_NAME_A, portName)) {
-        addInternalPortAsNetdev = TRUE;
-    }
-
-    if (portName && portType == OVS_VPORT_TYPE_INTERNAL &&
-        strcmp(OVS_DPPORT_INTERNAL_NAME_A, portName)) {
-        isBridgeInternal = TRUE;
-    }
-
-    if (portType == OVS_VPORT_TYPE_INTERNAL && !isBridgeInternal) {
-        vport = gOvsSwitchContext->internalVport;
-    } else if (portType == OVS_VPORT_TYPE_NETDEV) {
+    if (portType == OVS_VPORT_TYPE_NETDEV) {
         /* External ports can also be looked up like VIF ports. */
         vport = OvsFindVportByHvNameA(gOvsSwitchContext, portName);
     } else {
         ASSERT(OvsIsTunnelVportType(portType) ||
-               (portType == OVS_VPORT_TYPE_INTERNAL && isBridgeInternal));
+               portType == OVS_VPORT_TYPE_INTERNAL);
 
         vport = (POVS_VPORT_ENTRY)OvsAllocateVport();
         if (vport == NULL) {
@@ -2177,10 +2194,12 @@
                 break;
             }
 
-            PNL_ATTR attr = NlAttrFindNested(vportAttrs[OVS_VPORT_ATTR_OPTIONS],
-                                             OVS_TUNNEL_ATTR_DST_PORT);
-            if (attr) {
-                transportPortDest = NlAttrGetU16(attr);
+            if (vportAttrs[OVS_VPORT_ATTR_OPTIONS]) {
+                PNL_ATTR attr = NlAttrFindNested(vportAttrs[OVS_VPORT_ATTR_OPTIONS],
+                                                 OVS_TUNNEL_ATTR_DST_PORT);
+                if (attr) {
+                    transportPortDest = NlAttrGetU16(attr);
+                }
             }
 
             status = OvsInitTunnelVport(usrParamsCtx,
@@ -2218,10 +2237,6 @@
         goto Cleanup;
     }
 
-    /* Initialize the vport with OVS specific properties. */
-    if (addInternalPortAsNetdev != TRUE) {
-        vport->ovsType = portType;
-    }
     if (vportAttrs[OVS_VPORT_ATTR_PORT_NO] != NULL) {
         /*
          * XXX: when we implement the limit for ovs port number to be
@@ -2332,7 +2347,8 @@
     if (!NlAttrParse((PNL_MSG_HDR)msgIn,
         NLMSG_HDRLEN + GENL_HDRLEN + OVS_HDRLEN,
         NlMsgAttrsLen((PNL_MSG_HDR)msgIn),
-        ovsVportPolicy, vportAttrs, ARRAY_SIZE(vportAttrs))) {
+        ovsVportPolicy, ARRAY_SIZE(ovsVportPolicy),
+        vportAttrs, ARRAY_SIZE(vportAttrs))) {
         return STATUS_INVALID_PARAMETER;
     }
 
@@ -2434,7 +2450,8 @@
     if (!NlAttrParse((PNL_MSG_HDR)msgIn,
         NLMSG_HDRLEN + GENL_HDRLEN + OVS_HDRLEN,
         NlMsgAttrsLen((PNL_MSG_HDR)msgIn),
-        ovsVportPolicy, vportAttrs, ARRAY_SIZE(vportAttrs))) {
+        ovsVportPolicy, ARRAY_SIZE(ovsVportPolicy),
+        vportAttrs, ARRAY_SIZE(vportAttrs))) {
         return STATUS_INVALID_PARAMETER;
     }
 
@@ -2590,7 +2607,8 @@
         if (!NlAttrParse((PNL_MSG_HDR)msgIn,
             NLMSG_HDRLEN + GENL_HDRLEN + OVS_HDRLEN,
             NlMsgAttrsLen((PNL_MSG_HDR)msgIn),
-            ovsVportPolicy, vportAttrs, ARRAY_SIZE(vportAttrs))) {
+            ovsVportPolicy, ARRAY_SIZE(ovsVportPolicy),
+            vportAttrs, ARRAY_SIZE(vportAttrs))) {
             nlError = NL_ERROR_INVAL;
             break;
         }
diff -Nru openvswitch-2.4.0/datapath-windows/ovsext/Vport.h openvswitch-2.4.1/datapath-windows/ovsext/Vport.h
--- openvswitch-2.4.0/datapath-windows/ovsext/Vport.h	2015-08-20 00:33:42.736962969 +0000
+++ openvswitch-2.4.1/datapath-windows/ovsext/Vport.h	2016-03-22 13:09:54.398615283 +0000
@@ -34,11 +34,6 @@
  */
 #define OVS_DPPORT_NUMBER_LOCAL    0
 
-#define OVS_DPPORT_INTERNAL_NAME_A  "internal"
-#define OVS_DPPORT_INTERNAL_NAME_W  L"internal"
-#define OVS_DPPORT_EXTERNAL_NAME_A   "external"
-#define OVS_DPPORT_EXTERNAL_NAME_W  L"external"
-
 /*
  * A Vport, or Virtual Port, is a port on the OVS. It can be one of the
  * following types. Some of the Vports are "real" ports on the hyper-v switch,
diff -Nru openvswitch-2.4.0/debian/changelog openvswitch-2.4.1/debian/changelog
--- openvswitch-2.4.0/debian/changelog	2015-10-15 20:04:07.000000000 +0000
+++ openvswitch-2.4.1/debian/changelog	2016-04-26 11:25:47.000000000 +0000
@@ -1,3 +1,10 @@
+openvswitch (2.4.1-0ubuntu0.15.10.1) wily; urgency=medium
+
+  * New upstream point release (LP: #1575119):
+    - CVE-2016-2074: MPLS buffer overflow vulnerabilities.
+
+ -- James Page   Tue, 26 Apr 2016 06:25:44 -0500
+
 openvswitch (2.4.0-0ubuntu4) wily; urgency=medium
 
   [ Arata Notsu ]
diff -Nru openvswitch-2.4.0/Documentation/group-selection-method-property.txt openvswitch-2.4.1/Documentation/group-selection-method-property.txt
--- openvswitch-2.4.0/Documentation/group-selection-method-property.txt	2015-08-11 20:38:17.279287075 +0000
+++ openvswitch-2.4.1/Documentation/group-selection-method-property.txt	2016-03-22 13:09:54.386614999 +0000
@@ -47,7 +47,7 @@
 
 The Experimenter ID of this extension is:
 
-NTR_VENDOR_ID = 0x00001540
+NTR_VENDOR_ID = 0x0000154d
 
 
 4. Group Experimenter Property
diff -Nru openvswitch-2.4.0/include/openflow/openflow-common.h openvswitch-2.4.1/include/openflow/openflow-common.h
--- openvswitch-2.4.0/include/openflow/openflow-common.h	2015-08-20 00:33:42.832966838 +0000
+++ openvswitch-2.4.1/include/openflow/openflow-common.h	2016-03-22 13:09:54.410615543 +0000
@@ -103,7 +103,8 @@
  */
 #define OF_VENDOR_ID    0
 #define HPL_VENDOR_ID   0x000004EA /* HP Labs. */
-#define NTR_VENDOR_ID   0x00001540 /* Netronome. */
+#define NTR_VENDOR_ID   0x0000154d /* Netronome. */
+#define NTR_COMPAT_VENDOR_ID   0x00001540 /* Incorrect value used in v2.4. */
 #define NX_VENDOR_ID    0x00002320 /* Nicira. */
 #define ONF_VENDOR_ID   0x4f4e4600 /* Open Networking Foundation. */
 
diff -Nru openvswitch-2.4.0/include/openvswitch/version.h openvswitch-2.4.1/include/openvswitch/version.h
--- openvswitch-2.4.0/include/openvswitch/version.h	2015-08-21 17:01:13.099953399 +0000
+++ openvswitch-2.4.1/include/openvswitch/version.h	2016-03-22 13:11:11.352505322 +0000
@@ -18,8 +18,8 @@
 #ifndef OPENVSWITCH_VERSION_H
 #define OPENVSWITCH_VERSION_H 1
 
-#define OVS_PACKAGE_STRING  "openvswitch 2.4.0"
-#define OVS_PACKAGE_VERSION "2.4.0"
+#define OVS_PACKAGE_STRING  "openvswitch 2.4.1"
+#define OVS_PACKAGE_VERSION "2.4.1"
 
 #define OVS_LIB_VERSION     1
 #define OVS_LIB_REVISION    0
diff -Nru openvswitch-2.4.0/INSTALL.SSL.md openvswitch-2.4.1/INSTALL.SSL.md
--- openvswitch-2.4.0/INSTALL.SSL.md	2015-08-11 20:38:17.291287503 +0000
+++ openvswitch-2.4.1/INSTALL.SSL.md	2016-03-22 13:09:54.386614999 +0000
@@ -202,7 +202,7 @@
 
 1. Run the following command on the Open vSwitch itself:
 
-       % ovs-pki req sc switch
+       % ovs-pki req sc
 
    (This command does not require a copy of any of the PKI files
    generated by "ovs-pki init", and you should not copy them to the
diff -Nru openvswitch-2.4.0/lib/dpctl.c openvswitch-2.4.1/lib/dpctl.c
--- openvswitch-2.4.0/lib/dpctl.c	2015-08-21 00:18:21.202479281 +0000
+++ openvswitch-2.4.1/lib/dpctl.c	2016-03-22 13:09:54.414615651 +0000
@@ -796,7 +796,7 @@
             struct minimatch minimatch;
 
             odp_flow_key_to_flow(f.key, f.key_len, &flow);
-            odp_flow_key_to_mask(f.mask, f.mask_len, &wc.masks, &flow);
+            odp_flow_key_to_mask(f.mask, f.mask_len, &wc, &flow);
             match_init(&match, &flow, &wc);
 
             match_init(&match_filter, &flow_filter, &wc);
@@ -1582,15 +1582,13 @@
                       void *aux)
 {
     struct ds ds = DS_EMPTY_INITIALIZER;
-    struct dpctl_params dpctl_p;
     bool error = false;
 
-    dpctl_command_handler *handler = (dpctl_command_handler *) aux;
-
-    dpctl_p.print_statistics = false;
-    dpctl_p.zero_statistics = false;
-    dpctl_p.may_create = false;
-    dpctl_p.verbosity = 0;
+    struct dpctl_params dpctl_p = {
+        .is_appctl = true,
+        .output = dpctl_unixctl_print,
+        .aux = &ds,
+    };
 
     /* Parse options (like getopt). Unfortunately it does
      * not seem a good idea to call getopt_long() here, since it uses global
@@ -1643,10 +1641,7 @@
     }
 
     if (!error) {
-        dpctl_p.is_appctl = true;
-        dpctl_p.output = dpctl_unixctl_print;
-        dpctl_p.aux = &ds;
-
+        dpctl_command_handler *handler = (dpctl_command_handler *) aux;
         error = handler(argc, argv, &dpctl_p) != 0;
     }
 
@@ -1665,9 +1660,11 @@
     const struct dpctl_command *p;
 
     for (p = all_commands; p->name != NULL; p++) {
-        char *cmd_name = xasprintf("dpctl/%s", p->name);
-        unixctl_command_register(cmd_name, "", p->min_args, p->max_args,
-                                 dpctl_unixctl_handler, p->handler);
-        free(cmd_name);
+        if (strcmp(p->name, "help")) {
+            char *cmd_name = xasprintf("dpctl/%s", p->name);
+            unixctl_command_register(cmd_name, "", p->min_args, p->max_args,
+                                     dpctl_unixctl_handler, p->handler);
+            free(cmd_name);
+        }
     }
 }
diff -Nru openvswitch-2.4.0/lib/dpif-netdev.c openvswitch-2.4.1/lib/dpif-netdev.c
--- openvswitch-2.4.0/lib/dpif-netdev.c	2015-08-21 00:18:21.218479282 +0000
+++ openvswitch-2.4.1/lib/dpif-netdev.c	2016-03-22 13:09:54.414615651 +0000
@@ -1849,48 +1849,29 @@
 dpif_netdev_mask_from_nlattrs(const struct nlattr *key, uint32_t key_len,
                               const struct nlattr *mask_key,
                               uint32_t mask_key_len, const struct flow *flow,
-                              struct flow *mask)
+                              struct flow_wildcards *mask)
 {
-    if (mask_key_len) {
-        enum odp_key_fitness fitness;
+    enum odp_key_fitness fitness;
 
-        fitness = odp_flow_key_to_mask(mask_key, mask_key_len, mask, flow);
-        if (fitness) {
-            /* This should not happen: it indicates that
-             * odp_flow_key_from_mask() and odp_flow_key_to_mask()
-             * disagree on the acceptable form of a mask.  Log the problem
-             * as an error, with enough details to enable debugging. */
-            static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
-
-            if (!VLOG_DROP_ERR(&rl)) {
-                struct ds s;
-
-                ds_init(&s);
-                odp_flow_format(key, key_len, mask_key, mask_key_len, NULL, &s,
-                                true);
-                VLOG_ERR("internal error parsing flow mask %s (%s)",
-                         ds_cstr(&s), odp_key_fitness_to_string(fitness));
-                ds_destroy(&s);
-            }
+    fitness = odp_flow_key_to_mask(mask_key, mask_key_len, mask, flow);
+    if (fitness) {
+        /* This should not happen: it indicates that
+         * odp_flow_key_from_mask() and odp_flow_key_to_mask()
+         * disagree on the acceptable form of a mask.  Log the problem
+         * as an error, with enough details to enable debugging. */
+        static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
 
-            return EINVAL;
-        }
-    } else {
-        enum mf_field_id id;
-        /* No mask key, unwildcard everything except fields whose
-         * prerequisities are not met. */
-        memset(mask, 0x0, sizeof *mask);
-
-        for (id = 0; id < MFF_N_IDS; ++id) {
-            /* Skip registers and metadata. */
-            if (!(id >= MFF_REG0 && id < MFF_REG0 + FLOW_N_REGS)
-                && id != MFF_METADATA) {
-                const struct mf_field *mf = mf_from_id(id);
-                if (mf_are_prereqs_ok(mf, flow)) {
-                    mf_mask_field(mf, mask);
-                }
-            }
+        if (!VLOG_DROP_ERR(&rl)) {
+            struct ds s;
+
+            ds_init(&s);
+            odp_flow_format(key, key_len, mask_key, mask_key_len, NULL, &s,
+                            true);
+            VLOG_ERR("internal error parsing flow mask %s (%s)",
+                     ds_cstr(&s), odp_key_fitness_to_string(fitness));
+            ds_destroy(&s);
         }
+        return EINVAL;
     }
 
     /* Force unwildcard the in_port.
@@ -1899,7 +1880,7 @@
      * above because "everything" only includes the 16-bit OpenFlow port number
      * mask->in_port.ofp_port, which only covers half of the 32-bit datapath
      * port number mask->in_port.odp_port. */
-    mask->in_port.odp_port = u32_to_odp(UINT32_MAX);
+    mask->masks.in_port.odp_port = u32_to_odp(UINT32_MAX);
 
     return 0;
 }
@@ -2037,7 +2018,7 @@
     }
     error = dpif_netdev_mask_from_nlattrs(put->key, put->key_len,
                                           put->mask, put->mask_len,
-                                          &match.flow, &match.wc.masks);
+                                          &match.flow, &match.wc);
     if (error) {
         return error;
     }
diff -Nru openvswitch-2.4.0/lib/flow.c openvswitch-2.4.1/lib/flow.c
--- openvswitch-2.4.0/lib/flow.c	2015-08-21 00:18:21.306479280 +0000
+++ openvswitch-2.4.1/lib/flow.c	2016-03-22 13:09:54.418615767 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -197,7 +197,7 @@
 
 /* Data at 'valuep' may be unaligned. */
 #define miniflow_push_words_(MF, OFS, VALUEP, N_WORDS)          \
-{                                                               \
+if (N_WORDS) {                                                  \
     int ofs64 = (OFS) / 8;                                      \
                                                                         \
     MINIFLOW_ASSERT(MF.data + (N_WORDS) <= MF.end && (OFS) % 8 == 0     \
@@ -210,7 +210,7 @@
 
 /* Push 32-bit words padded to 64-bits. */
 #define miniflow_push_words_32_(MF, OFS, VALUEP, N_WORDS)               \
-{                                                                       \
+if (N_WORDS) {                                                          \
     int ofs64 = (OFS) / 8;                                              \
                                                                         \
     MINIFLOW_ASSERT(MF.data + DIV_ROUND_UP(N_WORDS, 2) <= MF.end        \
diff -Nru openvswitch-2.4.0/lib/netdev-bsd.c openvswitch-2.4.1/lib/netdev-bsd.c
--- openvswitch-2.4.0/lib/netdev-bsd.c	2015-08-11 20:38:17.611298981 +0000
+++ openvswitch-2.4.1/lib/netdev-bsd.c	2016-03-22 13:09:54.426615969 +0000
@@ -294,6 +294,7 @@
     if (error == ENXIO) {
         free(netdev->kernel_name);
         cache_notifier_unref();
+        ovs_mutex_destroy(&netdev->mutex);
         return error;
     }
 
diff -Nru openvswitch-2.4.0/lib/netdev-dpdk.c openvswitch-2.4.1/lib/netdev-dpdk.c
--- openvswitch-2.4.0/lib/netdev-dpdk.c	2015-08-21 00:18:21.386479276 +0000
+++ openvswitch-2.4.1/lib/netdev-dpdk.c	2016-03-22 13:09:54.426615969 +0000
@@ -270,7 +270,7 @@
 {
     struct rte_mbuf *pkt = (struct rte_mbuf *) p;
 
-    rte_pktmbuf_free_seg(pkt);
+    rte_pktmbuf_free(pkt);
 }
 
 static void
@@ -737,10 +737,13 @@
 {
     struct netdev_dpdk *dev = netdev_dpdk_cast(netdev_);
 
-    /* Can't remove a port while a guest is attached to it. */
+    /* Guest becomes an orphan if still attached. */
     if (netdev_dpdk_get_virtio(dev) != NULL) {
-        VLOG_ERR("Can not remove port, vhost device still attached");
-                return;
+        VLOG_ERR("Removing port '%s' while vhost device still attached.",
+                 netdev_->name);
+        VLOG_ERR("To restore connectivity after re-adding of port, VM on socket"
+                 " '%s' must be restarted.",
+                 dev->vhost_id);
     }
 
     ovs_mutex_lock(&dpdk_mutex);
@@ -902,7 +905,7 @@
         int i;
 
         for (i = nb_tx; i < txq->count; i++) {
-            rte_pktmbuf_free_seg(txq->burst_pkts[i]);
+            rte_pktmbuf_free(txq->burst_pkts[i]);
         }
         rte_spinlock_lock(&dev->stats_lock);
         dev->stats.tx_dropped += txq->count-nb_tx;
@@ -1616,8 +1619,12 @@
     smap_add_format(args, "max_vfs", "%u", dev_info.max_vfs);
     smap_add_format(args, "max_vmdq_pools", "%u", dev_info.max_vmdq_pools);
 
-    smap_add_format(args, "pci-vendor_id", "0x%u", dev_info.pci_dev->id.vendor_id);
-    smap_add_format(args, "pci-device_id", "0x%x", dev_info.pci_dev->id.device_id);
+    if (dev_info.pci_dev) {
+        smap_add_format(args, "pci-vendor_id", "0x%u",
+                        dev_info.pci_dev->id.vendor_id);
+        smap_add_format(args, "pci-device_id", "0x%x",
+                        dev_info.pci_dev->id.device_id);
+    }
 
     return 0;
 }
@@ -1736,6 +1743,7 @@
 destroy_device(volatile struct virtio_net *dev)
 {
     struct netdev_dpdk *vhost_dev;
+    bool exists = false;
 
     ovs_mutex_lock(&dpdk_mutex);
     LIST_FOR_EACH (vhost_dev, list_node, &dpdk_list) {
@@ -1744,24 +1752,32 @@
             ovs_mutex_lock(&vhost_dev->mutex);
             dev->flags &= ~VIRTIO_DEV_RUNNING;
             ovsrcu_set(&vhost_dev->virtio_dev, NULL);
+            exists = true;
             ovs_mutex_unlock(&vhost_dev->mutex);
-
-            /*
-             * Wait for other threads to quiesce before
-             * setting the virtio_dev to NULL.
-             */
-            ovsrcu_synchronize();
-            /*
-             * As call to ovsrcu_synchronize() will end the quiescent state,
-             * put thread back into quiescent state before returning.
-             */
-            ovsrcu_quiesce_start();
+            break;
         }
     }
+
     ovs_mutex_unlock(&dpdk_mutex);
 
-    VLOG_INFO("vHost Device '%s' (%ld) has been removed",
-               dev->ifname, dev->device_fh);
+    if (exists == true) {
+        /*
+         * Wait for other threads to quiesce after setting the 'virtio_dev'
+         * to NULL, before returning.
+         */
+        ovsrcu_synchronize();
+        /*
+         * As call to ovsrcu_synchronize() will end the quiescent state,
+         * put thread back into quiescent state before returning.
+         */
+        ovsrcu_quiesce_start();
+        VLOG_INFO("vHost Device '%s' %"PRIu64" has been removed", dev->ifname,
+                  dev->device_fh);
+    } else {
+        VLOG_INFO("vHost Device '%s' %"PRIu64" not found", dev->ifname,
+                  dev->device_fh);
+    }
+
 }
 
 struct virtio_net *
diff -Nru openvswitch-2.4.0/lib/netdev-linux.c openvswitch-2.4.1/lib/netdev-linux.c
--- openvswitch-2.4.0/lib/netdev-linux.c	2015-08-20 00:33:42.960971996 +0000
+++ openvswitch-2.4.1/lib/netdev-linux.c	2016-03-22 13:09:54.426615969 +0000
@@ -1071,7 +1071,7 @@
     if (retval) {
         if (retval != EAGAIN && retval != EMSGSIZE) {
             VLOG_WARN_RL(&rl, "error receiving Ethernet packet on %s: %s",
-                         ovs_strerror(errno), netdev_rxq_get_name(rxq_));
+                         netdev_rxq_get_name(rxq_), ovs_strerror(errno));
         }
         dp_packet_delete(buffer);
     } else {
@@ -5300,7 +5300,11 @@
     }
 
     COVERAGE_INC(netdev_set_ethtool);
-    evalue.data = new_flags = (evalue.data & ~flag) | (enable ? flag : 0);
+    new_flags = (evalue.data & ~flag) | (enable ? flag : 0);
+    if (new_flags == evalue.data) {
+        return 0;
+    }
+    evalue.data = new_flags;
     error = netdev_linux_do_ethtool(netdev_name,
                                     (struct ethtool_cmd *)&evalue,
                                     ETHTOOL_SFLAGS, "ETHTOOL_SFLAGS");
diff -Nru openvswitch-2.4.0/lib/netlink-socket.c openvswitch-2.4.1/lib/netlink-socket.c
--- openvswitch-2.4.0/lib/netlink-socket.c	2015-08-11 20:38:17.631299696 +0000
+++ openvswitch-2.4.1/lib/netlink-socket.c	2016-03-22 13:09:54.426615969 +0000
@@ -195,6 +195,7 @@
         goto error;
     }
     sock->rcvbuf = retval;
+    retval = 0;
 
     /* Connect to kernel (pid 0) as remote address. */
     memset(&remote, 0, sizeof remote);
diff -Nru openvswitch-2.4.0/lib/nx-match.c openvswitch-2.4.1/lib/nx-match.c
--- openvswitch-2.4.0/lib/nx-match.c	2015-08-21 00:18:21.442479276 +0000
+++ openvswitch-2.4.1/lib/nx-match.c	2016-03-22 13:09:54.430616062 +0000
@@ -781,7 +781,7 @@
                   flow->nw_tos & IP_ECN_MASK);
     }
 
-    if (!oxm && match->wc.masks.nw_ttl) {
+    if (match->wc.masks.nw_ttl) {
         nxm_put_8(b, MFF_IP_TTL, oxm, flow->nw_ttl);
     }
 
diff -Nru openvswitch-2.4.0/lib/odp-util.c openvswitch-2.4.1/lib/odp-util.c
--- openvswitch-2.4.0/lib/odp-util.c	2015-08-21 00:18:28.218479104 +0000
+++ openvswitch-2.4.1/lib/odp-util.c	2016-03-22 13:09:54.430616062 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -565,7 +565,7 @@
                   IP_ARGS(get_16aligned_be32(&ip->ip_dst)),
                   ip->ip_proto, ip->ip_tos,
                   ip->ip_ttl,
-                  ip->ip_frag_off);
+                  ntohs(ip->ip_frag_off));
 
     if (data->tnl_type == OVS_VPORT_TYPE_VXLAN) {
         const struct vxlanhdr *vxh;
@@ -872,6 +872,7 @@
     struct udp_header *udp;
     struct gre_base_hdr *greh;
     uint16_t gre_proto, gre_flags, dl_type, udp_src, udp_dst, csum;
+    uint16_t ip_frag_off;
     ovs_be32 sip, dip;
     uint32_t tnl_type = 0, header_len = 0;
     void *l3, *l4;
@@ -907,9 +908,10 @@
                          IP_SCAN_ARGS(&sip),
                          IP_SCAN_ARGS(&dip),
                          &ip->ip_proto, &ip->ip_tos,
-                         &ip->ip_ttl, &ip->ip_frag_off)) {
+                         &ip->ip_ttl, &ip_frag_off)) {
         return -EINVAL;
     }
+    ip->ip_frag_off = htons(ip_frag_off);
     put_16aligned_be32(&ip->ip_src, sip);
     put_16aligned_be32(&ip->ip_dst, dip);
 
@@ -3557,8 +3559,12 @@
             if (flow->tp_dst == htons(0)
                 && (flow->tp_src == htons(ND_NEIGHBOR_SOLICIT)
                     || flow->tp_src == htons(ND_NEIGHBOR_ADVERT))
-                && (!export_mask || (data->tp_src == htons(0xffff)
-                                     && data->tp_dst == htons(0xffff)))) {
+                /* Even though 'tp_src' and 'tp_dst' are 16 bits wide, ICMP
+                 * type and code are 8 bits wide.  Therefore, an exact match
+                 * looks like htons(0xff), not htons(0xffff).  See
+                 * xlate_wc_finish() for details. */
+                && (!export_mask || (data->tp_src == htons(0xff)
+                                     && data->tp_dst == htons(0xff)))) {
 
                 struct ovs_key_nd *nd_key;
 
@@ -4086,9 +4092,14 @@
                     memcpy(flow->arp_sha, nd_key->nd_sll, ETH_ADDR_LEN);
                     memcpy(flow->arp_tha, nd_key->nd_tll, ETH_ADDR_LEN);
                     if (is_mask) {
+                        /* Even though 'tp_src' and 'tp_dst' are 16 bits wide,
+                         * ICMP type and code are 8 bits wide.  Therefore, an
+                         * exact match looks like htons(0xff), not
+                         * htons(0xffff).  See xlate_wc_finish() for details.
+                         * */
                         if (!is_all_zeros(nd_key, sizeof *nd_key) &&
-                            (flow->tp_src != htons(0xffff) ||
-                             flow->tp_dst != htons(0xffff))) {
+                            (flow->tp_src != htons(0xff) ||
+                             flow->tp_dst != htons(0xff))) {
                             return ODP_FIT_ERROR;
                         } else {
                             expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ND;
@@ -4313,9 +4324,17 @@
  * 'key' fits our expectations for what a flow key should contain. */
 enum odp_key_fitness
 odp_flow_key_to_mask(const struct nlattr *key, size_t key_len,
-                     struct flow *mask, const struct flow *flow)
+                     struct flow_wildcards *mask, const struct flow *flow)
 {
-   return odp_flow_key_to_flow__(key, key_len, mask, flow);
+    if (key_len) {
+        return odp_flow_key_to_flow__(key, key_len, &mask->masks, flow);
+    } else {
+        /* A missing mask means that the flow should be exact matched.
+         * Generate an appropriate exact wildcard for the flow. */
+        flow_wildcards_init_for_packet(mask, flow);
+
+        return ODP_FIT_PERFECT;
+    }
 }
 
 /* Returns 'fitness' as a string, for use in debug messages. */
diff -Nru openvswitch-2.4.0/lib/odp-util.h openvswitch-2.4.1/lib/odp-util.h
--- openvswitch-2.4.0/lib/odp-util.h	2015-08-21 00:18:21.486479273 +0000
+++ openvswitch-2.4.1/lib/odp-util.h	2016-03-22 13:09:54.430616062 +0000
@@ -189,7 +189,7 @@
 enum odp_key_fitness odp_flow_key_to_flow(const struct nlattr *, size_t,
                                           struct flow *);
 enum odp_key_fitness odp_flow_key_to_mask(const struct nlattr *key, size_t len,
-                                          struct flow *mask,
+                                          struct flow_wildcards *mask,
                                           const struct flow *flow);
 const char *odp_key_fitness_to_string(enum odp_key_fitness);
 
diff -Nru openvswitch-2.4.0/lib/ofp-actions.c openvswitch-2.4.1/lib/ofp-actions.c
--- openvswitch-2.4.0/lib/ofp-actions.c	2015-08-21 00:18:21.522479274 +0000
+++ openvswitch-2.4.1/lib/ofp-actions.c	2016-03-22 13:09:54.430616062 +0000
@@ -967,9 +967,9 @@
     for (i = 0; i < bundle->n_slaves; i++) {
         uint16_t ofp_port = ntohs(((ovs_be16 *)(nab + 1))[i]);
         ofpbuf_put(ofpacts, &ofp_port, sizeof ofp_port);
+        bundle = ofpacts->header;
     }
 
-    bundle = ofpacts->header;
     ofpact_update_len(ofpacts, &bundle->ofpact);
 
     if (!error) {
@@ -5358,6 +5358,8 @@
         ogt->table_id = oigt->table_id;
     }
 
+    ofpact_pad(ofpacts);
+
     error = ofpacts_verify(ofpacts->data, ofpacts->size,
                            (1u << N_OVS_INSTRUCTIONS) - 1);
 exit:
@@ -6203,8 +6205,12 @@
 void
 ofpact_update_len(struct ofpbuf *ofpacts, struct ofpact *ofpact)
 {
+    ptrdiff_t len;
+
     ovs_assert(ofpact == ofpacts->header);
-    ofpact->len = (char *) ofpbuf_tail(ofpacts) - (char *) ofpact;
+    len = (char *) ofpbuf_tail(ofpacts) - (char *) ofpact;
+    ovs_assert(len <= UINT16_MAX);
+    ofpact->len = len;
 }
 
 /* Pads out 'ofpacts' to a multiple of OFPACT_ALIGNTO bytes in length.  Each
diff -Nru openvswitch-2.4.0/lib/ofp-parse.c openvswitch-2.4.1/lib/ofp-parse.c
--- openvswitch-2.4.0/lib/ofp-parse.c	2015-08-21 00:18:21.558479272 +0000
+++ openvswitch-2.4.1/lib/ofp-parse.c	2016-03-22 13:09:54.430616062 +0000
@@ -955,6 +955,7 @@
         error = parse_ofp_flow_mod_str(&(*fms)[*n_fms], ds_cstr(&s), command,
                                        &usable);
         if (error) {
+            char *err_msg;
             size_t i;
 
             for (i = 0; i < *n_fms; i++) {
@@ -969,7 +970,9 @@
                 fclose(stream);
             }
 
-            return xasprintf("%s:%d: %s", file_name, line_number, error);
+            err_msg = xasprintf("%s:%d: %s", file_name, line_number, error);
+            free(error);
+            return err_msg;
         }
         *usable_protocols &= usable; /* Each line can narrow the set. */
         *n_fms += 1;
@@ -1197,24 +1200,20 @@
 parse_select_group_field(char *s, struct field_array *fa,
                          enum ofputil_protocol *usable_protocols)
 {
-    char *save_ptr = NULL;
-    char *name;
+    char *name, *value_str;
 
-    for (name = strtok_r(s, "=, \t\r\n", &save_ptr); name;
-         name = strtok_r(NULL, "=, \t\r\n", &save_ptr)) {
+    while (ofputil_parse_key_value(&s, &name, &value_str)) {
         const struct mf_field *mf = mf_from_name(name);
 
         if (mf) {
             char *error;
-            const char *value_str;
             union mf_value value;
 
             if (bitmap_is_set(fa->used.bm, mf->id)) {
                 return xasprintf("%s: duplicate field", name);
             }
 
-            value_str = strtok_r(NULL, ", \t\r\n", &save_ptr);
-            if (value_str) {
+            if (*value_str) {
                 error = mf_parse_value(mf, value_str, &value);
                 if (error) {
                     return error;
@@ -1265,10 +1264,8 @@
         F_COMMAND_BUCKET_ID     = 1 << 2,
         F_COMMAND_BUCKET_ID_ALL = 1 << 3,
     } fields;
-    char *save_ptr = NULL;
     bool had_type = false;
     bool had_command_bucket_id = false;
-    char *name;
     struct ofputil_bucket *bucket;
     char *error = NULL;
 
@@ -1326,16 +1323,9 @@
     }
 
     /* Parse everything before the buckets. */
-    for (name = strtok_r(string, "=, \t\r\n", &save_ptr); name;
-         name = strtok_r(NULL, "=, \t\r\n", &save_ptr)) {
-        char *value;
-
-        value = strtok_r(NULL, ", \t\r\n", &save_ptr);
-        if (!value) {
-            error = xasprintf("field %s missing value", name);
-            goto out;
-        }
-
+    char *pos = string;
+    char *name, *value;
+    while (ofputil_parse_key_value(&pos, &name, &value)) {
         if (!strcmp(name, "command_bucket_id")) {
             if (!(fields & F_COMMAND_BUCKET_ID)) {
                 error = xstrdup("command bucket id is not needed");
diff -Nru openvswitch-2.4.0/lib/ofp-print.c openvswitch-2.4.1/lib/ofp-print.c
--- openvswitch-2.4.0/lib/ofp-print.c	2015-08-21 00:18:21.574479273 +0000
+++ openvswitch-2.4.1/lib/ofp-print.c	2016-03-22 13:09:54.434616156 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -2136,22 +2136,20 @@
     }
 
     if (props->selection_method[0]) {
-        size_t mark, start;
-
-        ds_put_format(s, ",selection_method=%s,", props->selection_method);
+        ds_put_format(s, ",selection_method=%s", props->selection_method);
         if (props->selection_method_param) {
-            ds_put_format(s, "selection_method_param=%"PRIu64",",
+            ds_put_format(s, ",selection_method_param=%"PRIu64,
                           props->selection_method_param);
         }
 
-        /* Allow rewinding to immediately before the trailing ',' */
-        mark = s->length - 1;
-
-        ds_put_cstr(s, "fields=");
-        start = s->length;
-        oxm_format_field_array(s, &props->fields);
-        if (s->length == start) {
-            ds_truncate(s, mark);
+        size_t n = bitmap_count1(props->fields.used.bm, MFF_N_IDS);
+        if (n == 1) {
+            ds_put_cstr(s, ",fields=");
+            oxm_format_field_array(s, &props->fields);
+        } else if (n > 1) {
+            ds_put_cstr(s, ",fields(");
+            oxm_format_field_array(s, &props->fields);
+            ds_put_char(s, ')');
         }
     }
 
@@ -2621,7 +2619,6 @@
 {
     int error;
     struct ofputil_bundle_add_msg badd;
-    char *msg;
 
     error = ofputil_decode_bundle_add(oh, &badd, NULL);
     if (error) {
@@ -2635,10 +2632,8 @@
     ofp_print_bit_names(s, badd.flags, bundle_flags_to_name, ' ');
 
     ds_put_char(s, '\n');
-    msg = ofp_to_string(badd.msg, ntohs(badd.msg->length), verbosity);
-    if (msg) {
-        ds_put_cstr(s, msg);
-    }
+    char *msg = ofp_to_string(badd.msg, ntohs(badd.msg->length), verbosity);
+    ds_put_and_free_cstr(s, msg);
 }
 
 static void
diff -Nru openvswitch-2.4.0/lib/ofp-util.c openvswitch-2.4.1/lib/ofp-util.c
--- openvswitch-2.4.0/lib/ofp-util.c	2015-08-21 00:18:21.622479271 +0000
+++ openvswitch-2.4.1/lib/ofp-util.c	2016-03-22 13:09:54.438616249 +0000
@@ -1997,6 +1997,7 @@
 
     ofputil_put_bands(mc->n_bands, mc->bands, msg);
 
+    reply = ofpbuf_at_assert(msg, start_ofs, sizeof *reply);
     reply->length = htons(msg->size - start_ofs);
 
     ofpmp_postappend(replies, start_ofs);
@@ -7437,7 +7438,6 @@
                                  gds->type, reply, version);
     }
     ogds = ofpbuf_at_assert(reply, start_ogds, sizeof *ogds);
-    ogds->length = htons(reply->size - start_ogds);
     ogds->type = gds->type;
     ogds->group_id = htonl(gds->group_id);
     ogds->bucket_list_len =  htons(reply->size - start_buckets);
@@ -7447,6 +7447,8 @@
         ofputil_put_group_prop_ntr_selection_method(version, &gds->props,
                                                     reply);
     }
+    ogds = ofpbuf_at_assert(reply, start_ogds, sizeof *ogds);
+    ogds->length = htons(reply->size - start_ogds);
 
     ofpmp_postappend(replies, start_ogds);
 }
@@ -7845,6 +7847,7 @@
 
     switch (experimenter) {
     case NTR_VENDOR_ID:
+    case NTR_COMPAT_VENDOR_ID:
         error = parse_group_prop_ntr(payload, exp_type, group_type,
                                      group_cmd, gp);
         break;
@@ -7991,7 +7994,7 @@
      * claim that the group mod command is OFPGC15_ADD to
      * satisfy the check in parse_group_prop_ntr_selection_method() */
     return parse_ofp15_group_properties(msg, gd->type, OFPGC15_ADD, &gd->props,
-                                        msg->size);
+                                        length - sizeof *ogds - bucket_list_len);
 }
 
 /* Converts a group description reply in 'msg' into an abstract
@@ -8332,7 +8335,7 @@
     case OFPGT11_FF:
         break;
     default:
-        OVS_NOT_REACHED();
+        return OFPERR_OFPGMFC_BAD_TYPE;
     }
 
     switch (gm->command) {
@@ -8347,7 +8350,7 @@
         }
         break;
     default:
-        OVS_NOT_REACHED();
+        return OFPERR_OFPGMFC_BAD_COMMAND;
     }
 
     LIST_FOR_EACH (bucket, list_node, &gm->buckets) {
diff -Nru openvswitch-2.4.0/lib/ovs-rcu.h openvswitch-2.4.1/lib/ovs-rcu.h
--- openvswitch-2.4.0/lib/ovs-rcu.h	2015-08-11 20:38:17.723302997 +0000
+++ openvswitch-2.4.1/lib/ovs-rcu.h	2016-03-22 13:09:54.442616342 +0000
@@ -56,7 +56,8 @@
  *
  *         Brackets a time period during which the current thread is quiescent.
  *
- * A newly created thread is initially active, not quiescent.
+ * A newly created thread is initially active, not quiescent. When a process
+ * becomes multithreaded, the main thread becomes active, not quiescent.
  *
  * When a quiescient state has occurred in every thread, we say that a "grace
  * period" has occurred.  Following a grace period, all of the callbacks
diff -Nru openvswitch-2.4.0/lib/ovs-thread.c openvswitch-2.4.1/lib/ovs-thread.c
--- openvswitch-2.4.0/lib/ovs-thread.c	2015-08-11 20:38:17.727303141 +0000
+++ openvswitch-2.4.1/lib/ovs-thread.c	2016-03-22 13:09:54.442616342 +0000
@@ -345,13 +345,28 @@
 pthread_t
 ovs_thread_create(const char *name, void *(*start)(void *), void *arg)
 {
+    static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;
     struct ovsthread_aux *aux;
     pthread_t thread;
     int error;
 
     forbid_forking("multiple threads exist");
     multithreaded = true;
-    ovsrcu_quiesce_end();
+
+    if (ovsthread_once_start(&once)) {
+        /* The first call to this function has to happen in the main thread.
+         * Before the process becomes multithreaded we make sure that the
+         * main thread is considered non quiescent.
+         *
+         * For other threads this is done in ovs_thread_wrapper(), but the
+         * main thread has no such wrapper.
+         *
+         * There's no reason to call ovsrcu_quiesce_end() in subsequent
+         * invocations of this function and it might introduce problems
+         * for other threads. */
+        ovsrcu_quiesce_end();
+        ovsthread_once_done(&once);
+    }
 
     aux = xmalloc(sizeof *aux);
     aux->start = start;
@@ -665,7 +680,7 @@
     n = n_keys;
     ovs_mutex_unlock(&key_mutex);
 
-    for (i = 0; i < n / L2_SIZE; i++) {
+    for (i = 0; i < DIV_ROUND_UP(n, L2_SIZE); i++) {
         free(slots->p1[i]);
     }
     free(slots);
diff -Nru openvswitch-2.4.0/lib/rstp.c openvswitch-2.4.1/lib/rstp.c
--- openvswitch-2.4.0/lib/rstp.c	2015-08-11 20:38:17.755304145 +0000
+++ openvswitch-2.4.1/lib/rstp.c	2016-03-22 13:09:54.446616442 +0000
@@ -185,6 +185,7 @@
 
         list_remove(&rstp->node);
         ovs_mutex_unlock(&rstp_mutex);
+        hmap_destroy(&rstp->ports);
         free(rstp->name);
         free(rstp);
     }
diff -Nru openvswitch-2.4.0/lib/seq.c openvswitch-2.4.1/lib/seq.c
--- openvswitch-2.4.0/lib/seq.c	2015-08-11 20:38:17.755304145 +0000
+++ openvswitch-2.4.1/lib/seq.c	2016-03-22 13:09:54.446616442 +0000
@@ -20,6 +20,7 @@
 
 #include 
 
+#include "coverage.h"
 #include "hash.h"
 #include "hmap.h"
 #include "latch.h"
@@ -27,6 +28,8 @@
 #include "ovs-thread.h"
 #include "poll-loop.h"
 
+COVERAGE_DEFINE(seq_change);
+
 /* A sequence number object. */
 struct seq {
     uint64_t value OVS_GUARDED;
@@ -74,6 +77,9 @@
     seq_init();
 
     seq = xmalloc(sizeof *seq);
+
+    COVERAGE_INC(seq_change);
+
     ovs_mutex_lock(&seq_mutex);
     seq->value = seq_next++;
     hmap_init(&seq->waiters);
@@ -100,6 +106,8 @@
 seq_change(struct seq *seq)
     OVS_EXCLUDED(seq_mutex)
 {
+    COVERAGE_INC(seq_change);
+
     ovs_mutex_lock(&seq_mutex);
     seq->value = seq_next++;
     seq_wake_waiters(seq);
diff -Nru openvswitch-2.4.0/lib/stream-ssl.c openvswitch-2.4.1/lib/stream-ssl.c
--- openvswitch-2.4.0/lib/stream-ssl.c	2015-08-20 00:33:43.084976991 +0000
+++ openvswitch-2.4.1/lib/stream-ssl.c	2016-03-22 13:09:54.450616546 +0000
@@ -806,7 +806,7 @@
     }
 
     port = ss_get_port(&ss);
-    snprintf(bound_name, sizeof bound_name, "ptcp:%"PRIu16":%s",
+    snprintf(bound_name, sizeof bound_name, "pssl:%"PRIu16":%s",
              port, ss_format_address(&ss, addrbuf, sizeof addrbuf));
 
     pssl = xmalloc(sizeof *pssl);
@@ -856,7 +856,7 @@
         return error;
     }
 
-    snprintf(name, sizeof name, "tcp:%s:%"PRIu16,
+    snprintf(name, sizeof name, "ssl:%s:%"PRIu16,
              ss_format_address(&ss, addrbuf, sizeof addrbuf),
              ss_get_port(&ss));
     return new_ssl_stream(name, new_fd, SERVER, STATE_SSL_CONNECTING,
diff -Nru openvswitch-2.4.0/lib/tnl-ports.c openvswitch-2.4.1/lib/tnl-ports.c
--- openvswitch-2.4.0/lib/tnl-ports.c	2015-08-21 00:18:21.722479269 +0000
+++ openvswitch-2.4.1/lib/tnl-ports.c	2016-03-22 13:09:54.450616546 +0000
@@ -91,8 +91,14 @@
 
         match.wc.masks.dl_type = OVS_BE16_MAX;
         match.wc.masks.nw_proto = 0xff;
-        match.wc.masks.nw_frag = 0xff;      /* XXX: No fragments support. */
-        match.wc.masks.tp_dst = OVS_BE16_MAX;
+         /* XXX: No fragments support. */
+        match.wc.masks.nw_frag = FLOW_NW_FRAG_MASK;
+
+        /* 'udp_port' is zero for non-UDP tunnels (e.g. GRE). In this case it
+         * doesn't make sense to match on UDP port numbers. */
+        if (udp_port) {
+            match.wc.masks.tp_dst = OVS_BE16_MAX;
+        }
 
         cls_rule_init(&p->cr, &match, 0, CLS_MIN_VERSION); /* Priority == 0. */
         ovs_refcount_init(&p->ref_cnt);
diff -Nru openvswitch-2.4.0/m4/libtool.m4 openvswitch-2.4.1/m4/libtool.m4
--- openvswitch-2.4.0/m4/libtool.m4	2015-08-21 17:00:49.071248809 +0000
+++ openvswitch-2.4.1/m4/libtool.m4	2016-03-22 12:54:30.099913705 +0000
@@ -1,8 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -146,6 +146,8 @@
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -637,7 +639,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -801,6 +803,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -822,6 +825,31 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -852,6 +880,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -954,7 +986,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1047,6 +1089,8 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1268,7 +1312,7 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -1280,9 +1324,19 @@
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*)
+	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64-*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1301,7 +1355,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -1330,14 +1387,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1414,13 +1484,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -1600,6 +1670,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1626,7 +1701,8 @@
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -1639,7 +1715,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2185,7 +2261,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2194,7 +2270,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2259,7 +2335,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2398,7 +2474,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2406,10 +2482,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2417,7 +2489,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2435,7 +2507,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2454,19 +2526,8 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -2527,7 +2588,7 @@
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2543,7 +2604,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2580,9 +2641,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2657,7 +2718,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2726,7 +2787,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2751,7 +2812,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2775,7 +2836,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2806,7 +2867,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2816,7 +2877,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3197,10 +3258,6 @@
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3238,8 +3295,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3658,6 +3715,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -3990,7 +4048,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4242,7 +4300,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4287,7 +4347,7 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -4334,18 +4394,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -4505,7 +4580,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4533,7 +4610,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4787,8 +4863,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5084,6 +5159,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5130,10 +5206,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5146,7 +5218,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5185,7 +5257,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5627,9 +5698,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5787,7 +5855,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6157,7 +6224,7 @@
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6173,9 +6240,6 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6337,7 +6401,7 @@
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6918,12 +6982,18 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7120,7 +7190,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7253,7 +7322,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7440,6 +7508,77 @@
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7509,6 +7648,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
diff -Nru openvswitch-2.4.0/m4/ltoptions.m4 openvswitch-2.4.1/m4/ltoptions.m4
--- openvswitch-2.4.0/m4/ltoptions.m4	2015-08-21 17:00:49.107248808 +0000
+++ openvswitch-2.4.1/m4/ltoptions.m4	2016-03-22 12:54:30.135914589 +0000
@@ -326,9 +326,24 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
diff -Nru openvswitch-2.4.0/m4/ltversion.m4 openvswitch-2.4.1/m4/ltversion.m4
--- openvswitch-2.4.0/m4/ltversion.m4	2015-08-21 17:00:49.187248805 +0000
+++ openvswitch-2.4.1/m4/ltversion.m4	2016-03-22 12:54:30.223916750 +0000
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff -Nru openvswitch-2.4.0/Makefile.in openvswitch-2.4.1/Makefile.in
--- openvswitch-2.4.0/Makefile.in	2015-08-21 17:01:45.263168583 +0000
+++ openvswitch-2.4.1/Makefile.in	2016-03-22 13:11:00.332234655 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -85,6 +84,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -133,48 +177,56 @@
 @GNU_MAKE_TRUE@	missing-distfiles distfiles
 @HAVE_GROFF_TRUE@am__append_8 = manpage-check
 @HAVE_GROFF_TRUE@am__append_9 = manpage-check
-DIST_COMMON = $(am__configure_deps) $(am__noinst_HEADERS_DIST) \
-	$(dist_check_SCRIPTS) $(dist_man_MANS) $(dist_noinst_SCRIPTS) \
-	$(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \
-	$(dist_sbin_SCRIPTS) $(dist_scripts_DATA) \
-	$(dist_scripts_SCRIPTS) $(openflowinclude_HEADERS) \
-	$(openvswitchinclude_HEADERS) \
-	$(srcdir)/Documentation/automake.mk $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/datapath-windows/automake.mk \
-	$(srcdir)/datapath-windows/include/automake.mk \
-	$(srcdir)/debian/automake.mk $(srcdir)/include/automake.mk \
+DIST_COMMON = $(srcdir)/manpages.mk \
+	$(srcdir)/Documentation/automake.mk $(srcdir)/m4/automake.mk \
+	$(srcdir)/lib/automake.mk $(srcdir)/ofproto/automake.mk \
+	$(srcdir)/utilities/automake.mk \
+	$(srcdir)/utilities/bugtool/automake.mk \
+	$(srcdir)/tests/automake.mk $(srcdir)/include/automake.mk \
 	$(srcdir)/include/openflow/automake.mk \
 	$(srcdir)/include/openvswitch/automake.mk \
 	$(srcdir)/include/sparse/automake.mk \
 	$(srcdir)/include/windows/automake.mk \
-	$(srcdir)/lib/automake.mk $(srcdir)/m4/automake.mk \
-	$(srcdir)/manpages.mk $(srcdir)/ofproto/automake.mk \
-	$(srcdir)/ovsdb/automake.mk $(srcdir)/python/automake.mk \
-	$(srcdir)/python/compat/automake.mk $(srcdir)/rhel/automake.mk \
-	$(srcdir)/tests/automake.mk $(srcdir)/third-party/automake.mk \
-	$(srcdir)/tutorial/automake.mk $(srcdir)/utilities/automake.mk \
-	$(srcdir)/utilities/bugtool/automake.mk \
-	$(srcdir)/vswitchd/automake.mk $(srcdir)/vtep/automake.mk \
-	$(srcdir)/windows/automake.mk $(srcdir)/xenserver/automake.mk \
-	$(top_srcdir)/configure $(top_srcdir)/datapath/linux/Kbuild.in \
+	$(srcdir)/third-party/automake.mk $(srcdir)/debian/automake.mk \
+	$(srcdir)/vswitchd/automake.mk $(srcdir)/ovsdb/automake.mk \
+	$(srcdir)/rhel/automake.mk $(srcdir)/xenserver/automake.mk \
+	$(srcdir)/python/automake.mk \
+	$(srcdir)/python/compat/automake.mk \
+	$(srcdir)/tutorial/automake.mk $(srcdir)/vtep/automake.mk \
+	$(srcdir)/datapath-windows/automake.mk \
+	$(srcdir)/datapath-windows/include/automake.mk \
+	$(srcdir)/windows/automake.mk $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.h.in \
+	$(top_srcdir)/lib/stdio.h.in $(top_srcdir)/lib/string.h.in \
+	$(top_srcdir)/ovsdb/libovsdb.sym.in \
+	$(top_srcdir)/ofproto/libofproto.sym.in \
+	$(top_srcdir)/lib/libsflow.sym.in \
+	$(top_srcdir)/lib/libopenvswitch.sym.in \
+	$(top_srcdir)/vtep/libvtep.sym.in \
+	$(top_srcdir)/datapath/linux/Kbuild.in \
 	$(top_srcdir)/datapath/linux/Makefile.in \
 	$(top_srcdir)/datapath/linux/Makefile.main.in \
-	$(top_srcdir)/include/openvswitch/version.h.in \
+	$(top_srcdir)/tests/atlocal.in \
 	$(top_srcdir)/lib/libopenvswitch.pc.in \
-	$(top_srcdir)/lib/libopenvswitch.sym.in \
 	$(top_srcdir)/lib/libsflow.pc.in \
-	$(top_srcdir)/lib/libsflow.sym.in $(top_srcdir)/lib/stdio.h.in \
-	$(top_srcdir)/lib/string.h.in \
 	$(top_srcdir)/ofproto/libofproto.pc.in \
-	$(top_srcdir)/ofproto/libofproto.sym.in \
 	$(top_srcdir)/ovsdb/libovsdb.pc.in \
-	$(top_srcdir)/ovsdb/libovsdb.sym.in \
-	$(top_srcdir)/tests/atlocal.in \
-	$(top_srcdir)/vtep/libvtep.sym.in AUTHORS COPYING NEWS \
+	$(top_srcdir)/include/openvswitch/version.h.in \
+	$(dist_check_SCRIPTS) $(dist_noinst_SCRIPTS) \
+	$(dist_pkgdata_SCRIPTS) $(dist_sbin_SCRIPTS) \
+	$(dist_scripts_SCRIPTS) $(top_srcdir)/build-aux/depcomp \
+	$(dist_man_MANS) $(dist_pkgdata_DATA) $(dist_scripts_DATA) \
+	$(am__noinst_HEADERS_DIST) $(openflowinclude_HEADERS) \
+	$(openvswitchinclude_HEADERS) AUTHORS COPYING NEWS \
 	build-aux/compile build-aux/config.guess build-aux/config.sub \
-	build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
-	build-aux/missing
+	build-aux/depcomp build-aux/install-sh build-aux/missing \
+	build-aux/ltmain.sh $(top_srcdir)/build-aux/compile \
+	$(top_srcdir)/build-aux/config.guess \
+	$(top_srcdir)/build-aux/config.sub \
+	$(top_srcdir)/build-aux/install-sh \
+	$(top_srcdir)/build-aux/ltmain.sh \
+	$(top_srcdir)/build-aux/missing
 @VSTUDIO_DDK_TRUE@am__append_10 = ovsext_make
 @VSTUDIO_DDK_TRUE@am__append_11 = ovsext_clean
 @WIN32_TRUE@am__append_12 = ${PTHREAD_LIBS}
@@ -317,6 +369,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(completiondir)" "$(DESTDIR)$(pkgdatadir)" \
@@ -486,9 +544,10 @@
 nodist_lib_libopenvswitch_la_OBJECTS = lib/dirs.lo $(am__objects_12)
 lib_libopenvswitch_la_OBJECTS = $(am_lib_libopenvswitch_la_OBJECTS) \
 	$(nodist_lib_libopenvswitch_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 lib_libopenvswitch_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(lib_libopenvswitch_la_LDFLAGS) \
@@ -583,7 +642,7 @@
 	tests/test-hmap.c tests/test-json.c tests/test-jsonrpc.c \
 	tests/test-list.c tests/test-lockfile.c tests/test-multipath.c \
 	tests/test-netflow.c tests/test-odp.c tests/test-ofpbuf.c \
-	tests/test-packets.c tests/test-random.c \
+	tests/test-packets.c tests/test-random.c tests/test-rcu.c \
 	tests/test-reconnect.c tests/test-rstp.c tests/test-sflow.c \
 	tests/test-sha1.c tests/test-stp.c tests/test-util.c \
 	tests/test-uuid.c tests/test-bitmap.c tests/test-vconn.c \
@@ -601,12 +660,12 @@
 	tests/test-multipath.$(OBJEXT) tests/test-netflow.$(OBJEXT) \
 	tests/test-odp.$(OBJEXT) tests/test-ofpbuf.$(OBJEXT) \
 	tests/test-packets.$(OBJEXT) tests/test-random.$(OBJEXT) \
-	tests/test-reconnect.$(OBJEXT) tests/test-rstp.$(OBJEXT) \
-	tests/test-sflow.$(OBJEXT) tests/test-sha1.$(OBJEXT) \
-	tests/test-stp.$(OBJEXT) tests/test-util.$(OBJEXT) \
-	tests/test-uuid.$(OBJEXT) tests/test-bitmap.$(OBJEXT) \
-	tests/test-vconn.$(OBJEXT) tests/test-aa.$(OBJEXT) \
-	$(am__objects_13)
+	tests/test-rcu.$(OBJEXT) tests/test-reconnect.$(OBJEXT) \
+	tests/test-rstp.$(OBJEXT) tests/test-sflow.$(OBJEXT) \
+	tests/test-sha1.$(OBJEXT) tests/test-stp.$(OBJEXT) \
+	tests/test-util.$(OBJEXT) tests/test-uuid.$(OBJEXT) \
+	tests/test-bitmap.$(OBJEXT) tests/test-vconn.$(OBJEXT) \
+	tests/test-aa.$(OBJEXT) $(am__objects_13)
 tests_ovstest_OBJECTS = $(am_tests_ovstest_OBJECTS)
 tests_ovstest_DEPENDENCIES = lib/libopenvswitch.la
 am__tests_test_dpdkr_SOURCES_DIST = tests/dpdk/ring_client.c
@@ -682,6 +741,18 @@
 	$(dist_pkgdata_SCRIPTS) $(dist_sbin_SCRIPTS) \
 	$(dist_scripts_SCRIPTS) $(noinst_SCRIPTS) $(sbin_SCRIPTS) \
 	$(scripts_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -692,22 +763,18 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(lib_libopenvswitch_la_SOURCES) \
 	$(nodist_lib_libopenvswitch_la_SOURCES) \
 	$(lib_libsflow_la_SOURCES) $(ofproto_libofproto_la_SOURCES) \
@@ -740,13 +807,19 @@
 	$(am__utilities_ovs_vlan_bug_workaround_SOURCES_DIST) \
 	$(utilities_ovs_vsctl_SOURCES) \
 	$(vswitchd_ovs_vswitchd_SOURCES) $(vtep_vtep_ctl_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 man1dir = $(mandir)/man1
 man5dir = $(mandir)/man5
 man8dir = $(mandir)/man8
@@ -1070,19 +1143,44 @@
 	$(openvswitchinclude_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -1110,7 +1208,10 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -2026,7 +2127,7 @@
 	tests/test-hmap.c tests/test-json.c tests/test-jsonrpc.c \
 	tests/test-list.c tests/test-lockfile.c tests/test-multipath.c \
 	tests/test-netflow.c tests/test-odp.c tests/test-ofpbuf.c \
-	tests/test-packets.c tests/test-random.c \
+	tests/test-packets.c tests/test-random.c tests/test-rcu.c \
 	tests/test-reconnect.c tests/test-rstp.c tests/test-sflow.c \
 	tests/test-sha1.c tests/test-stp.c tests/test-util.c \
 	tests/test-uuid.c tests/test-bitmap.c tests/test-vconn.c \
@@ -2216,7 +2317,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .in .h .hstamp .ovsidl .ovsschema .c .lo .o .obj
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/manpages.mk $(srcdir)/Documentation/automake.mk $(srcdir)/m4/automake.mk $(srcdir)/lib/automake.mk $(srcdir)/ofproto/automake.mk $(srcdir)/utilities/automake.mk $(srcdir)/utilities/bugtool/automake.mk $(srcdir)/tests/automake.mk $(srcdir)/include/automake.mk $(srcdir)/include/openflow/automake.mk $(srcdir)/include/openvswitch/automake.mk $(srcdir)/include/sparse/automake.mk $(srcdir)/include/windows/automake.mk $(srcdir)/third-party/automake.mk $(srcdir)/debian/automake.mk $(srcdir)/vswitchd/automake.mk $(srcdir)/ovsdb/automake.mk $(srcdir)/rhel/automake.mk $(srcdir)/xenserver/automake.mk $(srcdir)/python/automake.mk $(srcdir)/python/compat/automake.mk $(srcdir)/tutorial/automake.mk $(srcdir)/vtep/automake.mk $(srcdir)/datapath-windows/automake.mk $(srcdir)/datapath-windows/include/automake.mk $(srcdir)/windows/automake.mk $(am__configure_deps)
 	@for dep in $?; do \
@@ -2241,6 +2342,7 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/manpages.mk $(srcdir)/Documentation/automake.mk $(srcdir)/m4/automake.mk $(srcdir)/lib/automake.mk $(srcdir)/ofproto/automake.mk $(srcdir)/utilities/automake.mk $(srcdir)/utilities/bugtool/automake.mk $(srcdir)/tests/automake.mk $(srcdir)/include/automake.mk $(srcdir)/include/openflow/automake.mk $(srcdir)/include/openvswitch/automake.mk $(srcdir)/include/sparse/automake.mk $(srcdir)/include/windows/automake.mk $(srcdir)/third-party/automake.mk $(srcdir)/debian/automake.mk $(srcdir)/vswitchd/automake.mk $(srcdir)/ovsdb/automake.mk $(srcdir)/rhel/automake.mk $(srcdir)/xenserver/automake.mk $(srcdir)/python/automake.mk $(srcdir)/python/compat/automake.mk $(srcdir)/tutorial/automake.mk $(srcdir)/vtep/automake.mk $(srcdir)/datapath-windows/automake.mk $(srcdir)/datapath-windows/include/automake.mk $(srcdir)/windows/automake.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -2252,10 +2354,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -2299,9 +2399,9 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 include/openvswitch/version.h: $(top_builddir)/config.status $(top_srcdir)/include/openvswitch/version.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -2309,6 +2409,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -2324,12 +2426,14 @@
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 lib/$(am__dirstamp):
 	@$(MKDIR_P) lib
 	@: > lib/$(am__dirstamp)
@@ -2510,7 +2614,8 @@
 lib/stream-nossl.lo: lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
 lib/dirs.lo: lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
 lib/dhparams.lo: lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
-lib/libopenvswitch.la: $(lib_libopenvswitch_la_OBJECTS) $(lib_libopenvswitch_la_DEPENDENCIES) lib/$(am__dirstamp)
+
+lib/libopenvswitch.la: $(lib_libopenvswitch_la_OBJECTS) $(lib_libopenvswitch_la_DEPENDENCIES) $(EXTRA_lib_libopenvswitch_la_DEPENDENCIES) lib/$(am__dirstamp)
 	$(AM_V_CCLD)$(lib_libopenvswitch_la_LINK) -rpath $(libdir) $(lib_libopenvswitch_la_OBJECTS) $(lib_libopenvswitch_la_LIBADD) $(LIBS)
 lib/lib_libsflow_la-sflow_agent.lo: lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
@@ -2520,7 +2625,8 @@
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libsflow_la-sflow_receiver.lo: lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
-lib/libsflow.la: $(lib_libsflow_la_OBJECTS) $(lib_libsflow_la_DEPENDENCIES) lib/$(am__dirstamp)
+
+lib/libsflow.la: $(lib_libsflow_la_OBJECTS) $(lib_libsflow_la_DEPENDENCIES) $(EXTRA_lib_libsflow_la_DEPENDENCIES) lib/$(am__dirstamp)
 	$(AM_V_CCLD)$(lib_libsflow_la_LINK) -rpath $(libdir) $(lib_libsflow_la_OBJECTS) $(lib_libsflow_la_LIBADD) $(LIBS)
 ofproto/$(am__dirstamp):
 	@$(MKDIR_P) ofproto
@@ -2568,7 +2674,8 @@
 	ofproto/$(DEPDIR)/$(am__dirstamp)
 ofproto/ofproto_libofproto_la-bundles.lo: ofproto/$(am__dirstamp) \
 	ofproto/$(DEPDIR)/$(am__dirstamp)
-ofproto/libofproto.la: $(ofproto_libofproto_la_OBJECTS) $(ofproto_libofproto_la_DEPENDENCIES) ofproto/$(am__dirstamp)
+
+ofproto/libofproto.la: $(ofproto_libofproto_la_OBJECTS) $(ofproto_libofproto_la_DEPENDENCIES) $(EXTRA_ofproto_libofproto_la_DEPENDENCIES) ofproto/$(am__dirstamp)
 	$(AM_V_CCLD)$(ofproto_libofproto_la_LINK) -rpath $(libdir) $(ofproto_libofproto_la_OBJECTS) $(ofproto_libofproto_la_LIBADD) $(LIBS)
 ovsdb/$(am__dirstamp):
 	@$(MKDIR_P) ovsdb
@@ -2606,7 +2713,8 @@
 	ovsdb/$(DEPDIR)/$(am__dirstamp)
 ovsdb/ovsdb_libovsdb_la-transaction.lo: ovsdb/$(am__dirstamp) \
 	ovsdb/$(DEPDIR)/$(am__dirstamp)
-ovsdb/libovsdb.la: $(ovsdb_libovsdb_la_OBJECTS) $(ovsdb_libovsdb_la_DEPENDENCIES) ovsdb/$(am__dirstamp)
+
+ovsdb/libovsdb.la: $(ovsdb_libovsdb_la_OBJECTS) $(ovsdb_libovsdb_la_DEPENDENCIES) $(EXTRA_ovsdb_libovsdb_la_DEPENDENCIES) ovsdb/$(am__dirstamp)
 	$(AM_V_CCLD)$(ovsdb_libovsdb_la_LINK) -rpath $(libdir) $(ovsdb_libovsdb_la_OBJECTS) $(ovsdb_libovsdb_la_LIBADD) $(LIBS)
 vtep/$(am__dirstamp):
 	@$(MKDIR_P) vtep
@@ -2615,18 +2723,24 @@
 	@$(MKDIR_P) vtep/$(DEPDIR)
 	@: > vtep/$(DEPDIR)/$(am__dirstamp)
 vtep/vtep-idl.lo: vtep/$(am__dirstamp) vtep/$(DEPDIR)/$(am__dirstamp)
-vtep/libvtep.la: $(vtep_libvtep_la_OBJECTS) $(vtep_libvtep_la_DEPENDENCIES) vtep/$(am__dirstamp)
+
+vtep/libvtep.la: $(vtep_libvtep_la_OBJECTS) $(vtep_libvtep_la_DEPENDENCIES) $(EXTRA_vtep_libvtep_la_DEPENDENCIES) vtep/$(am__dirstamp)
 	$(AM_V_CCLD)$(vtep_libvtep_la_LINK) -rpath $(libdir) $(vtep_libvtep_la_OBJECTS) $(vtep_libvtep_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -2647,7 +2761,8 @@
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -2671,14 +2786,19 @@
 	rm -f $$list
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -2699,7 +2819,8 @@
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
@@ -2714,17 +2835,20 @@
 	rm -f $$list
 ovsdb/ovsdb-client.$(OBJEXT): ovsdb/$(am__dirstamp) \
 	ovsdb/$(DEPDIR)/$(am__dirstamp)
-ovsdb/ovsdb-client$(EXEEXT): $(ovsdb_ovsdb_client_OBJECTS) $(ovsdb_ovsdb_client_DEPENDENCIES) ovsdb/$(am__dirstamp)
+
+ovsdb/ovsdb-client$(EXEEXT): $(ovsdb_ovsdb_client_OBJECTS) $(ovsdb_ovsdb_client_DEPENDENCIES) $(EXTRA_ovsdb_ovsdb_client_DEPENDENCIES) ovsdb/$(am__dirstamp)
 	@rm -f ovsdb/ovsdb-client$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ovsdb_ovsdb_client_OBJECTS) $(ovsdb_ovsdb_client_LDADD) $(LIBS)
 ovsdb/ovsdb-server.$(OBJEXT): ovsdb/$(am__dirstamp) \
 	ovsdb/$(DEPDIR)/$(am__dirstamp)
-ovsdb/ovsdb-server$(EXEEXT): $(ovsdb_ovsdb_server_OBJECTS) $(ovsdb_ovsdb_server_DEPENDENCIES) ovsdb/$(am__dirstamp)
+
+ovsdb/ovsdb-server$(EXEEXT): $(ovsdb_ovsdb_server_OBJECTS) $(ovsdb_ovsdb_server_DEPENDENCIES) $(EXTRA_ovsdb_ovsdb_server_DEPENDENCIES) ovsdb/$(am__dirstamp)
 	@rm -f ovsdb/ovsdb-server$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ovsdb_ovsdb_server_OBJECTS) $(ovsdb_ovsdb_server_LDADD) $(LIBS)
 ovsdb/ovsdb-tool.$(OBJEXT): ovsdb/$(am__dirstamp) \
 	ovsdb/$(DEPDIR)/$(am__dirstamp)
-ovsdb/ovsdb-tool$(EXEEXT): $(ovsdb_ovsdb_tool_OBJECTS) $(ovsdb_ovsdb_tool_DEPENDENCIES) ovsdb/$(am__dirstamp)
+
+ovsdb/ovsdb-tool$(EXEEXT): $(ovsdb_ovsdb_tool_OBJECTS) $(ovsdb_ovsdb_tool_DEPENDENCIES) $(EXTRA_ovsdb_ovsdb_tool_DEPENDENCIES) ovsdb/$(am__dirstamp)
 	@rm -f ovsdb/ovsdb-tool$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ovsdb_ovsdb_tool_OBJECTS) $(ovsdb_ovsdb_tool_LDADD) $(LIBS)
 tests/$(am__dirstamp):
@@ -2779,6 +2903,8 @@
 	tests/$(DEPDIR)/$(am__dirstamp)
 tests/test-random.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
+tests/test-rcu.$(OBJEXT): tests/$(am__dirstamp) \
+	tests/$(DEPDIR)/$(am__dirstamp)
 tests/test-reconnect.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 tests/test-rstp.$(OBJEXT): tests/$(am__dirstamp) \
@@ -2801,7 +2927,8 @@
 	tests/$(DEPDIR)/$(am__dirstamp)
 tests/test-unix-socket.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
-tests/ovstest$(EXEEXT): $(tests_ovstest_OBJECTS) $(tests_ovstest_DEPENDENCIES) tests/$(am__dirstamp)
+
+tests/ovstest$(EXEEXT): $(tests_ovstest_OBJECTS) $(tests_ovstest_DEPENDENCIES) $(EXTRA_tests_ovstest_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/ovstest$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_ovstest_OBJECTS) $(tests_ovstest_LDADD) $(LIBS)
 tests/dpdk/$(am__dirstamp):
@@ -2812,29 +2939,34 @@
 	@: > tests/dpdk/$(DEPDIR)/$(am__dirstamp)
 tests/dpdk/ring_client.$(OBJEXT): tests/dpdk/$(am__dirstamp) \
 	tests/dpdk/$(DEPDIR)/$(am__dirstamp)
-tests/test-dpdkr$(EXEEXT): $(tests_test_dpdkr_OBJECTS) $(tests_test_dpdkr_DEPENDENCIES) tests/$(am__dirstamp)
+
+tests/test-dpdkr$(EXEEXT): $(tests_test_dpdkr_OBJECTS) $(tests_test_dpdkr_DEPENDENCIES) $(EXTRA_tests_test_dpdkr_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/test-dpdkr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_test_dpdkr_OBJECTS) $(tests_test_dpdkr_LDADD) $(LIBS)
 tests/test-lib.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
-tests/test-lib$(EXEEXT): $(tests_test_lib_OBJECTS) $(tests_test_lib_DEPENDENCIES) tests/$(am__dirstamp)
+
+tests/test-lib$(EXEEXT): $(tests_test_lib_OBJECTS) $(tests_test_lib_DEPENDENCIES) $(EXTRA_tests_test_lib_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/test-lib$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_test_lib_OBJECTS) $(tests_test_lib_LDADD) $(LIBS)
 tests/test-ovsdb.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 tests/idltest.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
-tests/test-ovsdb$(EXEEXT): $(tests_test_ovsdb_OBJECTS) $(tests_test_ovsdb_DEPENDENCIES) tests/$(am__dirstamp)
+
+tests/test-ovsdb$(EXEEXT): $(tests_test_ovsdb_OBJECTS) $(tests_test_ovsdb_DEPENDENCIES) $(EXTRA_tests_test_ovsdb_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/test-ovsdb$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_test_ovsdb_OBJECTS) $(tests_test_ovsdb_LDADD) $(LIBS)
 tests/test-strtok_r.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
-tests/test-strtok_r$(EXEEXT): $(tests_test_strtok_r_OBJECTS) $(tests_test_strtok_r_DEPENDENCIES) tests/$(am__dirstamp)
+
+tests/test-strtok_r$(EXEEXT): $(tests_test_strtok_r_OBJECTS) $(tests_test_strtok_r_DEPENDENCIES) $(EXTRA_tests_test_strtok_r_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/test-strtok_r$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_test_strtok_r_OBJECTS) $(tests_test_strtok_r_LDADD) $(LIBS)
 tests/test-type-props.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
-tests/test-type-props$(EXEEXT): $(tests_test_type_props_OBJECTS) $(tests_test_type_props_DEPENDENCIES) tests/$(am__dirstamp)
+
+tests/test-type-props$(EXEEXT): $(tests_test_type_props_OBJECTS) $(tests_test_type_props_DEPENDENCIES) $(EXTRA_tests_test_type_props_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/test-type-props$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_test_type_props_OBJECTS) $(tests_test_type_props_LDADD) $(LIBS)
 utilities/$(am__dirstamp):
@@ -2845,42 +2977,50 @@
 	@: > utilities/$(DEPDIR)/$(am__dirstamp)
 utilities/nlmon.$(OBJEXT): utilities/$(am__dirstamp) \
 	utilities/$(DEPDIR)/$(am__dirstamp)
-utilities/nlmon$(EXEEXT): $(utilities_nlmon_OBJECTS) $(utilities_nlmon_DEPENDENCIES) utilities/$(am__dirstamp)
+
+utilities/nlmon$(EXEEXT): $(utilities_nlmon_OBJECTS) $(utilities_nlmon_DEPENDENCIES) $(EXTRA_utilities_nlmon_DEPENDENCIES) utilities/$(am__dirstamp)
 	@rm -f utilities/nlmon$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(utilities_nlmon_OBJECTS) $(utilities_nlmon_LDADD) $(LIBS)
 utilities/ovs-appctl.$(OBJEXT): utilities/$(am__dirstamp) \
 	utilities/$(DEPDIR)/$(am__dirstamp)
-utilities/ovs-appctl$(EXEEXT): $(utilities_ovs_appctl_OBJECTS) $(utilities_ovs_appctl_DEPENDENCIES) utilities/$(am__dirstamp)
+
+utilities/ovs-appctl$(EXEEXT): $(utilities_ovs_appctl_OBJECTS) $(utilities_ovs_appctl_DEPENDENCIES) $(EXTRA_utilities_ovs_appctl_DEPENDENCIES) utilities/$(am__dirstamp)
 	@rm -f utilities/ovs-appctl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(utilities_ovs_appctl_OBJECTS) $(utilities_ovs_appctl_LDADD) $(LIBS)
 utilities/ovs-benchmark.$(OBJEXT): utilities/$(am__dirstamp) \
 	utilities/$(DEPDIR)/$(am__dirstamp)
-utilities/ovs-benchmark$(EXEEXT): $(utilities_ovs_benchmark_OBJECTS) $(utilities_ovs_benchmark_DEPENDENCIES) utilities/$(am__dirstamp)
+
+utilities/ovs-benchmark$(EXEEXT): $(utilities_ovs_benchmark_OBJECTS) $(utilities_ovs_benchmark_DEPENDENCIES) $(EXTRA_utilities_ovs_benchmark_DEPENDENCIES) utilities/$(am__dirstamp)
 	@rm -f utilities/ovs-benchmark$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(utilities_ovs_benchmark_OBJECTS) $(utilities_ovs_benchmark_LDADD) $(LIBS)
 utilities/ovs-dpctl.$(OBJEXT): utilities/$(am__dirstamp) \
 	utilities/$(DEPDIR)/$(am__dirstamp)
-utilities/ovs-dpctl$(EXEEXT): $(utilities_ovs_dpctl_OBJECTS) $(utilities_ovs_dpctl_DEPENDENCIES) utilities/$(am__dirstamp)
+
+utilities/ovs-dpctl$(EXEEXT): $(utilities_ovs_dpctl_OBJECTS) $(utilities_ovs_dpctl_DEPENDENCIES) $(EXTRA_utilities_ovs_dpctl_DEPENDENCIES) utilities/$(am__dirstamp)
 	@rm -f utilities/ovs-dpctl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(utilities_ovs_dpctl_OBJECTS) $(utilities_ovs_dpctl_LDADD) $(LIBS)
 utilities/ovs-ofctl.$(OBJEXT): utilities/$(am__dirstamp) \
 	utilities/$(DEPDIR)/$(am__dirstamp)
-utilities/ovs-ofctl$(EXEEXT): $(utilities_ovs_ofctl_OBJECTS) $(utilities_ovs_ofctl_DEPENDENCIES) utilities/$(am__dirstamp)
+
+utilities/ovs-ofctl$(EXEEXT): $(utilities_ovs_ofctl_OBJECTS) $(utilities_ovs_ofctl_DEPENDENCIES) $(EXTRA_utilities_ovs_ofctl_DEPENDENCIES) utilities/$(am__dirstamp)
 	@rm -f utilities/ovs-ofctl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(utilities_ovs_ofctl_OBJECTS) $(utilities_ovs_ofctl_LDADD) $(LIBS)
 utilities/ovs-testcontroller.$(OBJEXT): utilities/$(am__dirstamp) \
 	utilities/$(DEPDIR)/$(am__dirstamp)
-utilities/ovs-testcontroller$(EXEEXT): $(utilities_ovs_testcontroller_OBJECTS) $(utilities_ovs_testcontroller_DEPENDENCIES) utilities/$(am__dirstamp)
+
+utilities/ovs-testcontroller$(EXEEXT): $(utilities_ovs_testcontroller_OBJECTS) $(utilities_ovs_testcontroller_DEPENDENCIES) $(EXTRA_utilities_ovs_testcontroller_DEPENDENCIES) utilities/$(am__dirstamp)
 	@rm -f utilities/ovs-testcontroller$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(utilities_ovs_testcontroller_OBJECTS) $(utilities_ovs_testcontroller_LDADD) $(LIBS)
 utilities/ovs-vlan-bug-workaround.$(OBJEXT):  \
 	utilities/$(am__dirstamp) utilities/$(DEPDIR)/$(am__dirstamp)
-utilities/ovs-vlan-bug-workaround$(EXEEXT): $(utilities_ovs_vlan_bug_workaround_OBJECTS) $(utilities_ovs_vlan_bug_workaround_DEPENDENCIES) utilities/$(am__dirstamp)
+
+utilities/ovs-vlan-bug-workaround$(EXEEXT): $(utilities_ovs_vlan_bug_workaround_OBJECTS) $(utilities_ovs_vlan_bug_workaround_DEPENDENCIES) $(EXTRA_utilities_ovs_vlan_bug_workaround_DEPENDENCIES) utilities/$(am__dirstamp)
 	@rm -f utilities/ovs-vlan-bug-workaround$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(utilities_ovs_vlan_bug_workaround_OBJECTS) $(utilities_ovs_vlan_bug_workaround_LDADD) $(LIBS)
 utilities/ovs-vsctl.$(OBJEXT): utilities/$(am__dirstamp) \
 	utilities/$(DEPDIR)/$(am__dirstamp)
-utilities/ovs-vsctl$(EXEEXT): $(utilities_ovs_vsctl_OBJECTS) $(utilities_ovs_vsctl_DEPENDENCIES) utilities/$(am__dirstamp)
+
+utilities/ovs-vsctl$(EXEEXT): $(utilities_ovs_vsctl_OBJECTS) $(utilities_ovs_vsctl_DEPENDENCIES) $(EXTRA_utilities_ovs_vsctl_DEPENDENCIES) utilities/$(am__dirstamp)
 	@rm -f utilities/ovs-vsctl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(utilities_ovs_vsctl_OBJECTS) $(utilities_ovs_vsctl_LDADD) $(LIBS)
 vswitchd/$(am__dirstamp):
@@ -2897,18 +3037,23 @@
 	vswitchd/$(DEPDIR)/$(am__dirstamp)
 vswitchd/xenserver.$(OBJEXT): vswitchd/$(am__dirstamp) \
 	vswitchd/$(DEPDIR)/$(am__dirstamp)
-vswitchd/ovs-vswitchd$(EXEEXT): $(vswitchd_ovs_vswitchd_OBJECTS) $(vswitchd_ovs_vswitchd_DEPENDENCIES) vswitchd/$(am__dirstamp)
+
+vswitchd/ovs-vswitchd$(EXEEXT): $(vswitchd_ovs_vswitchd_OBJECTS) $(vswitchd_ovs_vswitchd_DEPENDENCIES) $(EXTRA_vswitchd_ovs_vswitchd_DEPENDENCIES) vswitchd/$(am__dirstamp)
 	@rm -f vswitchd/ovs-vswitchd$(EXEEXT)
 	$(AM_V_CCLD)$(vswitchd_ovs_vswitchd_LINK) $(vswitchd_ovs_vswitchd_OBJECTS) $(vswitchd_ovs_vswitchd_LDADD) $(LIBS)
 vtep/vtep-ctl.$(OBJEXT): vtep/$(am__dirstamp) \
 	vtep/$(DEPDIR)/$(am__dirstamp)
-vtep/vtep-ctl$(EXEEXT): $(vtep_vtep_ctl_OBJECTS) $(vtep_vtep_ctl_DEPENDENCIES) vtep/$(am__dirstamp)
+
+vtep/vtep-ctl$(EXEEXT): $(vtep_vtep_ctl_OBJECTS) $(vtep_vtep_ctl_DEPENDENCIES) $(EXTRA_vtep_vtep_ctl_DEPENDENCIES) vtep/$(am__dirstamp)
 	@rm -f vtep/vtep-ctl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(vtep_vtep_ctl_OBJECTS) $(vtep_vtep_ctl_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -2936,13 +3081,14 @@
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 install-completionSCRIPTS: $(completion_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(completiondir)" || $(MKDIR_P) "$(DESTDIR)$(completiondir)"
 	@list='$(completion_SCRIPTS)'; test -n "$(completiondir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(completiondir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(completiondir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -2970,13 +3116,14 @@
 	@list='$(completion_SCRIPTS)'; test -n "$(completiondir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(completiondir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(completiondir)" && rm -f $$files
+	dir='$(DESTDIR)$(completiondir)'; $(am__uninstall_files_from_dir)
 install-dist_pkgdataSCRIPTS: $(dist_pkgdata_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -3004,13 +3151,14 @@
 	@list='$(dist_pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
 install-dist_sbinSCRIPTS: $(dist_sbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(dist_sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -3038,13 +3186,14 @@
 	@list='$(dist_sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+	dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir)
 install-dist_scriptsSCRIPTS: $(dist_scripts_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
 	@list='$(dist_scripts_SCRIPTS)'; test -n "$(scriptsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(scriptsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -3072,13 +3221,14 @@
 	@list='$(dist_scripts_SCRIPTS)'; test -n "$(scriptsdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(scriptsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(scriptsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(scriptsdir)'; $(am__uninstall_files_from_dir)
 install-sbinSCRIPTS: $(sbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -3106,13 +3256,14 @@
 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+	dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir)
 install-scriptsSCRIPTS: $(scripts_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
 	@list='$(scripts_SCRIPTS)'; test -n "$(scriptsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(scriptsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -3140,440 +3291,24 @@
 	@list='$(scripts_SCRIPTS)'; test -n "$(scriptsdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(scriptsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(scriptsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(scriptsdir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f lib/aes128.$(OBJEXT)
-	-rm -f lib/aes128.lo
-	-rm -f lib/async-append-aio.$(OBJEXT)
-	-rm -f lib/async-append-aio.lo
-	-rm -f lib/async-append-null.$(OBJEXT)
-	-rm -f lib/async-append-null.lo
-	-rm -f lib/backtrace.$(OBJEXT)
-	-rm -f lib/backtrace.lo
-	-rm -f lib/bfd.$(OBJEXT)
-	-rm -f lib/bfd.lo
-	-rm -f lib/bundle.$(OBJEXT)
-	-rm -f lib/bundle.lo
-	-rm -f lib/byteq.$(OBJEXT)
-	-rm -f lib/byteq.lo
-	-rm -f lib/cfm.$(OBJEXT)
-	-rm -f lib/cfm.lo
-	-rm -f lib/classifier.$(OBJEXT)
-	-rm -f lib/classifier.lo
-	-rm -f lib/cmap.$(OBJEXT)
-	-rm -f lib/cmap.lo
-	-rm -f lib/command-line.$(OBJEXT)
-	-rm -f lib/command-line.lo
-	-rm -f lib/connectivity.$(OBJEXT)
-	-rm -f lib/connectivity.lo
-	-rm -f lib/coverage.$(OBJEXT)
-	-rm -f lib/coverage.lo
-	-rm -f lib/crc32c.$(OBJEXT)
-	-rm -f lib/crc32c.lo
-	-rm -f lib/csum.$(OBJEXT)
-	-rm -f lib/csum.lo
-	-rm -f lib/daemon-unix.$(OBJEXT)
-	-rm -f lib/daemon-unix.lo
-	-rm -f lib/daemon-windows.$(OBJEXT)
-	-rm -f lib/daemon-windows.lo
-	-rm -f lib/daemon.$(OBJEXT)
-	-rm -f lib/daemon.lo
-	-rm -f lib/dhparams.$(OBJEXT)
-	-rm -f lib/dhparams.lo
-	-rm -f lib/dirs.$(OBJEXT)
-	-rm -f lib/dirs.lo
-	-rm -f lib/dp-packet.$(OBJEXT)
-	-rm -f lib/dp-packet.lo
-	-rm -f lib/dpctl.$(OBJEXT)
-	-rm -f lib/dpctl.lo
-	-rm -f lib/dpif-netdev.$(OBJEXT)
-	-rm -f lib/dpif-netdev.lo
-	-rm -f lib/dpif-netlink.$(OBJEXT)
-	-rm -f lib/dpif-netlink.lo
-	-rm -f lib/dpif.$(OBJEXT)
-	-rm -f lib/dpif.lo
-	-rm -f lib/dummy.$(OBJEXT)
-	-rm -f lib/dummy.lo
-	-rm -f lib/dynamic-string.$(OBJEXT)
-	-rm -f lib/dynamic-string.lo
-	-rm -f lib/entropy.$(OBJEXT)
-	-rm -f lib/entropy.lo
-	-rm -f lib/fat-rwlock.$(OBJEXT)
-	-rm -f lib/fat-rwlock.lo
-	-rm -f lib/fatal-signal.$(OBJEXT)
-	-rm -f lib/fatal-signal.lo
-	-rm -f lib/flow.$(OBJEXT)
-	-rm -f lib/flow.lo
-	-rm -f lib/getopt_long.$(OBJEXT)
-	-rm -f lib/getopt_long.lo
-	-rm -f lib/getrusage-windows.$(OBJEXT)
-	-rm -f lib/getrusage-windows.lo
-	-rm -f lib/guarded-list.$(OBJEXT)
-	-rm -f lib/guarded-list.lo
-	-rm -f lib/hash.$(OBJEXT)
-	-rm -f lib/hash.lo
-	-rm -f lib/heap.$(OBJEXT)
-	-rm -f lib/heap.lo
-	-rm -f lib/hindex.$(OBJEXT)
-	-rm -f lib/hindex.lo
-	-rm -f lib/hmap.$(OBJEXT)
-	-rm -f lib/hmap.lo
-	-rm -f lib/hmapx.$(OBJEXT)
-	-rm -f lib/hmapx.lo
-	-rm -f lib/id-pool.$(OBJEXT)
-	-rm -f lib/id-pool.lo
-	-rm -f lib/jhash.$(OBJEXT)
-	-rm -f lib/jhash.lo
-	-rm -f lib/json.$(OBJEXT)
-	-rm -f lib/json.lo
-	-rm -f lib/jsonrpc.$(OBJEXT)
-	-rm -f lib/jsonrpc.lo
-	-rm -f lib/lacp.$(OBJEXT)
-	-rm -f lib/lacp.lo
-	-rm -f lib/latch-unix.$(OBJEXT)
-	-rm -f lib/latch-unix.lo
-	-rm -f lib/latch-windows.$(OBJEXT)
-	-rm -f lib/latch-windows.lo
-	-rm -f lib/learn.$(OBJEXT)
-	-rm -f lib/learn.lo
-	-rm -f lib/learning-switch.$(OBJEXT)
-	-rm -f lib/learning-switch.lo
-	-rm -f lib/lib_libsflow_la-sflow_agent.$(OBJEXT)
-	-rm -f lib/lib_libsflow_la-sflow_agent.lo
-	-rm -f lib/lib_libsflow_la-sflow_poller.$(OBJEXT)
-	-rm -f lib/lib_libsflow_la-sflow_poller.lo
-	-rm -f lib/lib_libsflow_la-sflow_receiver.$(OBJEXT)
-	-rm -f lib/lib_libsflow_la-sflow_receiver.lo
-	-rm -f lib/lib_libsflow_la-sflow_sampler.$(OBJEXT)
-	-rm -f lib/lib_libsflow_la-sflow_sampler.lo
-	-rm -f lib/lldp/lldp.$(OBJEXT)
-	-rm -f lib/lldp/lldp.lo
-	-rm -f lib/lldp/lldpd-structs.$(OBJEXT)
-	-rm -f lib/lldp/lldpd-structs.lo
-	-rm -f lib/lldp/lldpd.$(OBJEXT)
-	-rm -f lib/lldp/lldpd.lo
-	-rm -f lib/lockfile.$(OBJEXT)
-	-rm -f lib/lockfile.lo
-	-rm -f lib/mac-learning.$(OBJEXT)
-	-rm -f lib/mac-learning.lo
-	-rm -f lib/match.$(OBJEXT)
-	-rm -f lib/match.lo
-	-rm -f lib/mcast-snooping.$(OBJEXT)
-	-rm -f lib/mcast-snooping.lo
-	-rm -f lib/memory.$(OBJEXT)
-	-rm -f lib/memory.lo
-	-rm -f lib/meta-flow.$(OBJEXT)
-	-rm -f lib/meta-flow.lo
-	-rm -f lib/multipath.$(OBJEXT)
-	-rm -f lib/multipath.lo
-	-rm -f lib/netdev-bsd.$(OBJEXT)
-	-rm -f lib/netdev-bsd.lo
-	-rm -f lib/netdev-dpdk.$(OBJEXT)
-	-rm -f lib/netdev-dpdk.lo
-	-rm -f lib/netdev-dummy.$(OBJEXT)
-	-rm -f lib/netdev-dummy.lo
-	-rm -f lib/netdev-linux.$(OBJEXT)
-	-rm -f lib/netdev-linux.lo
-	-rm -f lib/netdev-vport.$(OBJEXT)
-	-rm -f lib/netdev-vport.lo
-	-rm -f lib/netdev-windows.$(OBJEXT)
-	-rm -f lib/netdev-windows.lo
-	-rm -f lib/netdev.$(OBJEXT)
-	-rm -f lib/netdev.lo
-	-rm -f lib/netlink-notifier.$(OBJEXT)
-	-rm -f lib/netlink-notifier.lo
-	-rm -f lib/netlink-socket.$(OBJEXT)
-	-rm -f lib/netlink-socket.lo
-	-rm -f lib/netlink.$(OBJEXT)
-	-rm -f lib/netlink.lo
-	-rm -f lib/nx-match.$(OBJEXT)
-	-rm -f lib/nx-match.lo
-	-rm -f lib/odp-execute.$(OBJEXT)
-	-rm -f lib/odp-execute.lo
-	-rm -f lib/odp-util.$(OBJEXT)
-	-rm -f lib/odp-util.lo
-	-rm -f lib/ofp-actions.$(OBJEXT)
-	-rm -f lib/ofp-actions.lo
-	-rm -f lib/ofp-errors.$(OBJEXT)
-	-rm -f lib/ofp-errors.lo
-	-rm -f lib/ofp-msgs.$(OBJEXT)
-	-rm -f lib/ofp-msgs.lo
-	-rm -f lib/ofp-parse.$(OBJEXT)
-	-rm -f lib/ofp-parse.lo
-	-rm -f lib/ofp-print.$(OBJEXT)
-	-rm -f lib/ofp-print.lo
-	-rm -f lib/ofp-util.$(OBJEXT)
-	-rm -f lib/ofp-util.lo
-	-rm -f lib/ofp-version-opt.$(OBJEXT)
-	-rm -f lib/ofp-version-opt.lo
-	-rm -f lib/ofpbuf.$(OBJEXT)
-	-rm -f lib/ofpbuf.lo
-	-rm -f lib/ovs-atomic-locked.$(OBJEXT)
-	-rm -f lib/ovs-atomic-locked.lo
-	-rm -f lib/ovs-lldp.$(OBJEXT)
-	-rm -f lib/ovs-lldp.lo
-	-rm -f lib/ovs-numa.$(OBJEXT)
-	-rm -f lib/ovs-numa.lo
-	-rm -f lib/ovs-rcu.$(OBJEXT)
-	-rm -f lib/ovs-rcu.lo
-	-rm -f lib/ovs-router.$(OBJEXT)
-	-rm -f lib/ovs-router.lo
-	-rm -f lib/ovs-thread.$(OBJEXT)
-	-rm -f lib/ovs-thread.lo
-	-rm -f lib/ovsdb-data.$(OBJEXT)
-	-rm -f lib/ovsdb-data.lo
-	-rm -f lib/ovsdb-error.$(OBJEXT)
-	-rm -f lib/ovsdb-error.lo
-	-rm -f lib/ovsdb-idl.$(OBJEXT)
-	-rm -f lib/ovsdb-idl.lo
-	-rm -f lib/ovsdb-parser.$(OBJEXT)
-	-rm -f lib/ovsdb-parser.lo
-	-rm -f lib/ovsdb-types.$(OBJEXT)
-	-rm -f lib/ovsdb-types.lo
-	-rm -f lib/packets.$(OBJEXT)
-	-rm -f lib/packets.lo
-	-rm -f lib/pcap-file.$(OBJEXT)
-	-rm -f lib/pcap-file.lo
-	-rm -f lib/perf-counter.$(OBJEXT)
-	-rm -f lib/perf-counter.lo
-	-rm -f lib/poll-loop.$(OBJEXT)
-	-rm -f lib/poll-loop.lo
-	-rm -f lib/process.$(OBJEXT)
-	-rm -f lib/process.lo
-	-rm -f lib/pvector.$(OBJEXT)
-	-rm -f lib/pvector.lo
-	-rm -f lib/random.$(OBJEXT)
-	-rm -f lib/random.lo
-	-rm -f lib/rconn.$(OBJEXT)
-	-rm -f lib/rconn.lo
-	-rm -f lib/reconnect.$(OBJEXT)
-	-rm -f lib/reconnect.lo
-	-rm -f lib/route-table-bsd.$(OBJEXT)
-	-rm -f lib/route-table-bsd.lo
-	-rm -f lib/route-table-stub.$(OBJEXT)
-	-rm -f lib/route-table-stub.lo
-	-rm -f lib/route-table.$(OBJEXT)
-	-rm -f lib/route-table.lo
-	-rm -f lib/rstp-state-machines.$(OBJEXT)
-	-rm -f lib/rstp-state-machines.lo
-	-rm -f lib/rstp.$(OBJEXT)
-	-rm -f lib/rstp.lo
-	-rm -f lib/rtbsd.$(OBJEXT)
-	-rm -f lib/rtbsd.lo
-	-rm -f lib/rtnetlink.$(OBJEXT)
-	-rm -f lib/rtnetlink.lo
-	-rm -f lib/seq.$(OBJEXT)
-	-rm -f lib/seq.lo
-	-rm -f lib/sha1.$(OBJEXT)
-	-rm -f lib/sha1.lo
-	-rm -f lib/shash.$(OBJEXT)
-	-rm -f lib/shash.lo
-	-rm -f lib/signals.$(OBJEXT)
-	-rm -f lib/signals.lo
-	-rm -f lib/simap.$(OBJEXT)
-	-rm -f lib/simap.lo
-	-rm -f lib/smap.$(OBJEXT)
-	-rm -f lib/smap.lo
-	-rm -f lib/socket-util-unix.$(OBJEXT)
-	-rm -f lib/socket-util-unix.lo
-	-rm -f lib/socket-util.$(OBJEXT)
-	-rm -f lib/socket-util.lo
-	-rm -f lib/sort.$(OBJEXT)
-	-rm -f lib/sort.lo
-	-rm -f lib/sset.$(OBJEXT)
-	-rm -f lib/sset.lo
-	-rm -f lib/stdio.$(OBJEXT)
-	-rm -f lib/stdio.lo
-	-rm -f lib/stp.$(OBJEXT)
-	-rm -f lib/stp.lo
-	-rm -f lib/stream-fd.$(OBJEXT)
-	-rm -f lib/stream-fd.lo
-	-rm -f lib/stream-nossl.$(OBJEXT)
-	-rm -f lib/stream-nossl.lo
-	-rm -f lib/stream-ssl.$(OBJEXT)
-	-rm -f lib/stream-ssl.lo
-	-rm -f lib/stream-tcp.$(OBJEXT)
-	-rm -f lib/stream-tcp.lo
-	-rm -f lib/stream-unix.$(OBJEXT)
-	-rm -f lib/stream-unix.lo
-	-rm -f lib/stream.$(OBJEXT)
-	-rm -f lib/stream.lo
-	-rm -f lib/string.$(OBJEXT)
-	-rm -f lib/string.lo
-	-rm -f lib/strsep.$(OBJEXT)
-	-rm -f lib/strsep.lo
-	-rm -f lib/svec.$(OBJEXT)
-	-rm -f lib/svec.lo
-	-rm -f lib/syslog-direct.$(OBJEXT)
-	-rm -f lib/syslog-direct.lo
-	-rm -f lib/syslog-libc.$(OBJEXT)
-	-rm -f lib/syslog-libc.lo
-	-rm -f lib/table.$(OBJEXT)
-	-rm -f lib/table.lo
-	-rm -f lib/tag.$(OBJEXT)
-	-rm -f lib/tag.lo
-	-rm -f lib/timer.$(OBJEXT)
-	-rm -f lib/timer.lo
-	-rm -f lib/timeval.$(OBJEXT)
-	-rm -f lib/timeval.lo
-	-rm -f lib/tnl-arp-cache.$(OBJEXT)
-	-rm -f lib/tnl-arp-cache.lo
-	-rm -f lib/tnl-ports.$(OBJEXT)
-	-rm -f lib/tnl-ports.lo
-	-rm -f lib/token-bucket.$(OBJEXT)
-	-rm -f lib/token-bucket.lo
-	-rm -f lib/unicode.$(OBJEXT)
-	-rm -f lib/unicode.lo
-	-rm -f lib/unixctl.$(OBJEXT)
-	-rm -f lib/unixctl.lo
-	-rm -f lib/util.$(OBJEXT)
-	-rm -f lib/util.lo
-	-rm -f lib/uuid.$(OBJEXT)
-	-rm -f lib/uuid.lo
-	-rm -f lib/vconn-stream.$(OBJEXT)
-	-rm -f lib/vconn-stream.lo
-	-rm -f lib/vconn.$(OBJEXT)
-	-rm -f lib/vconn.lo
-	-rm -f lib/vlan-bitmap.$(OBJEXT)
-	-rm -f lib/vlan-bitmap.lo
-	-rm -f lib/vlandev.$(OBJEXT)
-	-rm -f lib/vlandev.lo
-	-rm -f lib/vlog.$(OBJEXT)
-	-rm -f lib/vlog.lo
-	-rm -f lib/vswitch-idl.$(OBJEXT)
-	-rm -f lib/vswitch-idl.lo
-	-rm -f ofproto/ofproto_libofproto_la-bond.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-bond.lo
-	-rm -f ofproto/ofproto_libofproto_la-bundles.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-bundles.lo
-	-rm -f ofproto/ofproto_libofproto_la-collectors.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-collectors.lo
-	-rm -f ofproto/ofproto_libofproto_la-connmgr.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-connmgr.lo
-	-rm -f ofproto/ofproto_libofproto_la-fail-open.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-fail-open.lo
-	-rm -f ofproto/ofproto_libofproto_la-in-band.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-in-band.lo
-	-rm -f ofproto/ofproto_libofproto_la-names.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-names.lo
-	-rm -f ofproto/ofproto_libofproto_la-netflow.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-netflow.lo
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-ipfix.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-ipfix.lo
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-mirror.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-mirror.lo
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-monitor.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-monitor.lo
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-rid.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-rid.lo
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-sflow.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-sflow.lo
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-upcall.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-upcall.lo
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-xlate.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif-xlate.lo
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-ofproto-dpif.lo
-	-rm -f ofproto/ofproto_libofproto_la-ofproto.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-ofproto.lo
-	-rm -f ofproto/ofproto_libofproto_la-pinsched.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-pinsched.lo
-	-rm -f ofproto/ofproto_libofproto_la-pktbuf.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-pktbuf.lo
-	-rm -f ofproto/ofproto_libofproto_la-tunnel.$(OBJEXT)
-	-rm -f ofproto/ofproto_libofproto_la-tunnel.lo
-	-rm -f ovsdb/ovsdb-client.$(OBJEXT)
-	-rm -f ovsdb/ovsdb-server.$(OBJEXT)
-	-rm -f ovsdb/ovsdb-tool.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-column.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-column.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-condition.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-condition.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-execution.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-execution.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-file.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-file.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-jsonrpc-server.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-jsonrpc-server.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-log.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-log.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-monitor.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-monitor.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-mutation.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-mutation.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-ovsdb.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-ovsdb.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-query.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-query.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-row.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-row.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-server.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-server.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-table.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-table.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-transaction.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-transaction.lo
-	-rm -f ovsdb/ovsdb_libovsdb_la-trigger.$(OBJEXT)
-	-rm -f ovsdb/ovsdb_libovsdb_la-trigger.lo
-	-rm -f tests/dpdk/ring_client.$(OBJEXT)
-	-rm -f tests/idltest.$(OBJEXT)
-	-rm -f tests/ovstest.$(OBJEXT)
-	-rm -f tests/test-aa.$(OBJEXT)
-	-rm -f tests/test-aes128.$(OBJEXT)
-	-rm -f tests/test-atomic.$(OBJEXT)
-	-rm -f tests/test-bitmap.$(OBJEXT)
-	-rm -f tests/test-bundle.$(OBJEXT)
-	-rm -f tests/test-byte-order.$(OBJEXT)
-	-rm -f tests/test-classifier.$(OBJEXT)
-	-rm -f tests/test-cmap.$(OBJEXT)
-	-rm -f tests/test-csum.$(OBJEXT)
-	-rm -f tests/test-flows.$(OBJEXT)
-	-rm -f tests/test-hash.$(OBJEXT)
-	-rm -f tests/test-heap.$(OBJEXT)
-	-rm -f tests/test-hindex.$(OBJEXT)
-	-rm -f tests/test-hmap.$(OBJEXT)
-	-rm -f tests/test-json.$(OBJEXT)
-	-rm -f tests/test-jsonrpc.$(OBJEXT)
-	-rm -f tests/test-lib.$(OBJEXT)
-	-rm -f tests/test-list.$(OBJEXT)
-	-rm -f tests/test-lockfile.$(OBJEXT)
-	-rm -f tests/test-multipath.$(OBJEXT)
-	-rm -f tests/test-netflow.$(OBJEXT)
-	-rm -f tests/test-odp.$(OBJEXT)
-	-rm -f tests/test-ofpbuf.$(OBJEXT)
-	-rm -f tests/test-ovsdb.$(OBJEXT)
-	-rm -f tests/test-packets.$(OBJEXT)
-	-rm -f tests/test-random.$(OBJEXT)
-	-rm -f tests/test-reconnect.$(OBJEXT)
-	-rm -f tests/test-rstp.$(OBJEXT)
-	-rm -f tests/test-sflow.$(OBJEXT)
-	-rm -f tests/test-sha1.$(OBJEXT)
-	-rm -f tests/test-stp.$(OBJEXT)
-	-rm -f tests/test-strtok_r.$(OBJEXT)
-	-rm -f tests/test-type-props.$(OBJEXT)
-	-rm -f tests/test-unix-socket.$(OBJEXT)
-	-rm -f tests/test-util.$(OBJEXT)
-	-rm -f tests/test-uuid.$(OBJEXT)
-	-rm -f tests/test-vconn.$(OBJEXT)
-	-rm -f utilities/nlmon.$(OBJEXT)
-	-rm -f utilities/ovs-appctl.$(OBJEXT)
-	-rm -f utilities/ovs-benchmark.$(OBJEXT)
-	-rm -f utilities/ovs-dpctl.$(OBJEXT)
-	-rm -f utilities/ovs-ofctl.$(OBJEXT)
-	-rm -f utilities/ovs-testcontroller.$(OBJEXT)
-	-rm -f utilities/ovs-vlan-bug-workaround.$(OBJEXT)
-	-rm -f utilities/ovs-vsctl.$(OBJEXT)
-	-rm -f vswitchd/bridge.$(OBJEXT)
-	-rm -f vswitchd/ovs-vswitchd.$(OBJEXT)
-	-rm -f vswitchd/system-stats.$(OBJEXT)
-	-rm -f vswitchd/xenserver.$(OBJEXT)
-	-rm -f vtep/vtep-ctl.$(OBJEXT)
-	-rm -f vtep/vtep-idl.$(OBJEXT)
-	-rm -f vtep/vtep-idl.lo
+	-rm -f lib/*.$(OBJEXT)
+	-rm -f lib/*.lo
+	-rm -f lib/lldp/*.$(OBJEXT)
+	-rm -f lib/lldp/*.lo
+	-rm -f ofproto/*.$(OBJEXT)
+	-rm -f ofproto/*.lo
+	-rm -f ovsdb/*.$(OBJEXT)
+	-rm -f ovsdb/*.lo
+	-rm -f tests/*.$(OBJEXT)
+	-rm -f tests/dpdk/*.$(OBJEXT)
+	-rm -f utilities/*.$(OBJEXT)
+	-rm -f vswitchd/*.$(OBJEXT)
+	-rm -f vtep/*.$(OBJEXT)
+	-rm -f vtep/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -3794,6 +3529,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-ovsdb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-packets.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-random.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-rcu.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-reconnect.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-rstp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-sflow.Po@am__quote@
@@ -3825,340 +3561,298 @@
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 lib/lib_libsflow_la-sflow_agent.lo: lib/sflow_agent.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libsflow_la_CPPFLAGS) $(CPPFLAGS) $(lib_libsflow_la_CFLAGS) $(CFLAGS) -MT lib/lib_libsflow_la-sflow_agent.lo -MD -MP -MF lib/$(DEPDIR)/lib_libsflow_la-sflow_agent.Tpo -c -o lib/lib_libsflow_la-sflow_agent.lo `test -f 'lib/sflow_agent.c' || echo '$(srcdir)/'`lib/sflow_agent.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) lib/$(DEPDIR)/lib_libsflow_la-sflow_agent.Tpo lib/$(DEPDIR)/lib_libsflow_la-sflow_agent.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/sflow_agent.c' object='lib/lib_libsflow_la-sflow_agent.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lib/sflow_agent.c' object='lib/lib_libsflow_la-sflow_agent.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libsflow_la_CPPFLAGS) $(CPPFLAGS) $(lib_libsflow_la_CFLAGS) $(CFLAGS) -c -o lib/lib_libsflow_la-sflow_agent.lo `test -f 'lib/sflow_agent.c' || echo '$(srcdir)/'`lib/sflow_agent.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libsflow_la_CPPFLAGS) $(CPPFLAGS) $(lib_libsflow_la_CFLAGS) $(CFLAGS) -c -o lib/lib_libsflow_la-sflow_agent.lo `test -f 'lib/sflow_agent.c' || echo '$(srcdir)/'`lib/sflow_agent.c
 
 lib/lib_libsflow_la-sflow_sampler.lo: lib/sflow_sampler.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libsflow_la_CPPFLAGS) $(CPPFLAGS) $(lib_libsflow_la_CFLAGS) $(CFLAGS) -MT lib/lib_libsflow_la-sflow_sampler.lo -MD -MP -MF lib/$(DEPDIR)/lib_libsflow_la-sflow_sampler.Tpo -c -o lib/lib_libsflow_la-sflow_sampler.lo `test -f 'lib/sflow_sampler.c' || echo '$(srcdir)/'`lib/sflow_sampler.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) lib/$(DEPDIR)/lib_libsflow_la-sflow_sampler.Tpo lib/$(DEPDIR)/lib_libsflow_la-sflow_sampler.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/sflow_sampler.c' object='lib/lib_libsflow_la-sflow_sampler.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lib/sflow_sampler.c' object='lib/lib_libsflow_la-sflow_sampler.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libsflow_la_CPPFLAGS) $(CPPFLAGS) $(lib_libsflow_la_CFLAGS) $(CFLAGS) -c -o lib/lib_libsflow_la-sflow_sampler.lo `test -f 'lib/sflow_sampler.c' || echo '$(srcdir)/'`lib/sflow_sampler.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libsflow_la_CPPFLAGS) $(CPPFLAGS) $(lib_libsflow_la_CFLAGS) $(CFLAGS) -c -o lib/lib_libsflow_la-sflow_sampler.lo `test -f 'lib/sflow_sampler.c' || echo '$(srcdir)/'`lib/sflow_sampler.c
 
 lib/lib_libsflow_la-sflow_poller.lo: lib/sflow_poller.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libsflow_la_CPPFLAGS) $(CPPFLAGS) $(lib_libsflow_la_CFLAGS) $(CFLAGS) -MT lib/lib_libsflow_la-sflow_poller.lo -MD -MP -MF lib/$(DEPDIR)/lib_libsflow_la-sflow_poller.Tpo -c -o lib/lib_libsflow_la-sflow_poller.lo `test -f 'lib/sflow_poller.c' || echo '$(srcdir)/'`lib/sflow_poller.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) lib/$(DEPDIR)/lib_libsflow_la-sflow_poller.Tpo lib/$(DEPDIR)/lib_libsflow_la-sflow_poller.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/sflow_poller.c' object='lib/lib_libsflow_la-sflow_poller.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lib/sflow_poller.c' object='lib/lib_libsflow_la-sflow_poller.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libsflow_la_CPPFLAGS) $(CPPFLAGS) $(lib_libsflow_la_CFLAGS) $(CFLAGS) -c -o lib/lib_libsflow_la-sflow_poller.lo `test -f 'lib/sflow_poller.c' || echo '$(srcdir)/'`lib/sflow_poller.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libsflow_la_CPPFLAGS) $(CPPFLAGS) $(lib_libsflow_la_CFLAGS) $(CFLAGS) -c -o lib/lib_libsflow_la-sflow_poller.lo `test -f 'lib/sflow_poller.c' || echo '$(srcdir)/'`lib/sflow_poller.c
 
 lib/lib_libsflow_la-sflow_receiver.lo: lib/sflow_receiver.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libsflow_la_CPPFLAGS) $(CPPFLAGS) $(lib_libsflow_la_CFLAGS) $(CFLAGS) -MT lib/lib_libsflow_la-sflow_receiver.lo -MD -MP -MF lib/$(DEPDIR)/lib_libsflow_la-sflow_receiver.Tpo -c -o lib/lib_libsflow_la-sflow_receiver.lo `test -f 'lib/sflow_receiver.c' || echo '$(srcdir)/'`lib/sflow_receiver.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) lib/$(DEPDIR)/lib_libsflow_la-sflow_receiver.Tpo lib/$(DEPDIR)/lib_libsflow_la-sflow_receiver.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/sflow_receiver.c' object='lib/lib_libsflow_la-sflow_receiver.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lib/sflow_receiver.c' object='lib/lib_libsflow_la-sflow_receiver.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libsflow_la_CPPFLAGS) $(CPPFLAGS) $(lib_libsflow_la_CFLAGS) $(CFLAGS) -c -o lib/lib_libsflow_la-sflow_receiver.lo `test -f 'lib/sflow_receiver.c' || echo '$(srcdir)/'`lib/sflow_receiver.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libsflow_la_CPPFLAGS) $(CPPFLAGS) $(lib_libsflow_la_CFLAGS) $(CFLAGS) -c -o lib/lib_libsflow_la-sflow_receiver.lo `test -f 'lib/sflow_receiver.c' || echo '$(srcdir)/'`lib/sflow_receiver.c
 
 ofproto/ofproto_libofproto_la-bond.lo: ofproto/bond.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-bond.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-bond.Tpo -c -o ofproto/ofproto_libofproto_la-bond.lo `test -f 'ofproto/bond.c' || echo '$(srcdir)/'`ofproto/bond.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-bond.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-bond.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/bond.c' object='ofproto/ofproto_libofproto_la-bond.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/bond.c' object='ofproto/ofproto_libofproto_la-bond.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-bond.lo `test -f 'ofproto/bond.c' || echo '$(srcdir)/'`ofproto/bond.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-bond.lo `test -f 'ofproto/bond.c' || echo '$(srcdir)/'`ofproto/bond.c
 
 ofproto/ofproto_libofproto_la-collectors.lo: ofproto/collectors.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-collectors.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-collectors.Tpo -c -o ofproto/ofproto_libofproto_la-collectors.lo `test -f 'ofproto/collectors.c' || echo '$(srcdir)/'`ofproto/collectors.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-collectors.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-collectors.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/collectors.c' object='ofproto/ofproto_libofproto_la-collectors.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/collectors.c' object='ofproto/ofproto_libofproto_la-collectors.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-collectors.lo `test -f 'ofproto/collectors.c' || echo '$(srcdir)/'`ofproto/collectors.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-collectors.lo `test -f 'ofproto/collectors.c' || echo '$(srcdir)/'`ofproto/collectors.c
 
 ofproto/ofproto_libofproto_la-connmgr.lo: ofproto/connmgr.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-connmgr.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-connmgr.Tpo -c -o ofproto/ofproto_libofproto_la-connmgr.lo `test -f 'ofproto/connmgr.c' || echo '$(srcdir)/'`ofproto/connmgr.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-connmgr.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-connmgr.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/connmgr.c' object='ofproto/ofproto_libofproto_la-connmgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/connmgr.c' object='ofproto/ofproto_libofproto_la-connmgr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-connmgr.lo `test -f 'ofproto/connmgr.c' || echo '$(srcdir)/'`ofproto/connmgr.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-connmgr.lo `test -f 'ofproto/connmgr.c' || echo '$(srcdir)/'`ofproto/connmgr.c
 
 ofproto/ofproto_libofproto_la-fail-open.lo: ofproto/fail-open.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-fail-open.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-fail-open.Tpo -c -o ofproto/ofproto_libofproto_la-fail-open.lo `test -f 'ofproto/fail-open.c' || echo '$(srcdir)/'`ofproto/fail-open.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-fail-open.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-fail-open.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/fail-open.c' object='ofproto/ofproto_libofproto_la-fail-open.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/fail-open.c' object='ofproto/ofproto_libofproto_la-fail-open.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-fail-open.lo `test -f 'ofproto/fail-open.c' || echo '$(srcdir)/'`ofproto/fail-open.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-fail-open.lo `test -f 'ofproto/fail-open.c' || echo '$(srcdir)/'`ofproto/fail-open.c
 
 ofproto/ofproto_libofproto_la-in-band.lo: ofproto/in-band.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-in-band.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-in-band.Tpo -c -o ofproto/ofproto_libofproto_la-in-band.lo `test -f 'ofproto/in-band.c' || echo '$(srcdir)/'`ofproto/in-band.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-in-band.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-in-band.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/in-band.c' object='ofproto/ofproto_libofproto_la-in-band.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/in-band.c' object='ofproto/ofproto_libofproto_la-in-band.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-in-band.lo `test -f 'ofproto/in-band.c' || echo '$(srcdir)/'`ofproto/in-band.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-in-band.lo `test -f 'ofproto/in-band.c' || echo '$(srcdir)/'`ofproto/in-band.c
 
 ofproto/ofproto_libofproto_la-names.lo: ofproto/names.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-names.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-names.Tpo -c -o ofproto/ofproto_libofproto_la-names.lo `test -f 'ofproto/names.c' || echo '$(srcdir)/'`ofproto/names.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-names.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-names.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/names.c' object='ofproto/ofproto_libofproto_la-names.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/names.c' object='ofproto/ofproto_libofproto_la-names.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-names.lo `test -f 'ofproto/names.c' || echo '$(srcdir)/'`ofproto/names.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-names.lo `test -f 'ofproto/names.c' || echo '$(srcdir)/'`ofproto/names.c
 
 ofproto/ofproto_libofproto_la-netflow.lo: ofproto/netflow.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-netflow.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-netflow.Tpo -c -o ofproto/ofproto_libofproto_la-netflow.lo `test -f 'ofproto/netflow.c' || echo '$(srcdir)/'`ofproto/netflow.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-netflow.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-netflow.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/netflow.c' object='ofproto/ofproto_libofproto_la-netflow.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/netflow.c' object='ofproto/ofproto_libofproto_la-netflow.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-netflow.lo `test -f 'ofproto/netflow.c' || echo '$(srcdir)/'`ofproto/netflow.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-netflow.lo `test -f 'ofproto/netflow.c' || echo '$(srcdir)/'`ofproto/netflow.c
 
 ofproto/ofproto_libofproto_la-ofproto.lo: ofproto/ofproto.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-ofproto.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto.Tpo -c -o ofproto/ofproto_libofproto_la-ofproto.lo `test -f 'ofproto/ofproto.c' || echo '$(srcdir)/'`ofproto/ofproto.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/ofproto.c' object='ofproto/ofproto_libofproto_la-ofproto.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/ofproto.c' object='ofproto/ofproto_libofproto_la-ofproto.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto.lo `test -f 'ofproto/ofproto.c' || echo '$(srcdir)/'`ofproto/ofproto.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto.lo `test -f 'ofproto/ofproto.c' || echo '$(srcdir)/'`ofproto/ofproto.c
 
 ofproto/ofproto_libofproto_la-ofproto-dpif.lo: ofproto/ofproto-dpif.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-ofproto-dpif.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif.Tpo -c -o ofproto/ofproto_libofproto_la-ofproto-dpif.lo `test -f 'ofproto/ofproto-dpif.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/ofproto-dpif.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/ofproto-dpif.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif.lo `test -f 'ofproto/ofproto-dpif.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif.lo `test -f 'ofproto/ofproto-dpif.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif.c
 
 ofproto/ofproto_libofproto_la-ofproto-dpif-ipfix.lo: ofproto/ofproto-dpif-ipfix.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-ofproto-dpif-ipfix.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-ipfix.Tpo -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-ipfix.lo `test -f 'ofproto/ofproto-dpif-ipfix.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-ipfix.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-ipfix.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-ipfix.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/ofproto-dpif-ipfix.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-ipfix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/ofproto-dpif-ipfix.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-ipfix.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-ipfix.lo `test -f 'ofproto/ofproto-dpif-ipfix.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-ipfix.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-ipfix.lo `test -f 'ofproto/ofproto-dpif-ipfix.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-ipfix.c
 
 ofproto/ofproto_libofproto_la-ofproto-dpif-mirror.lo: ofproto/ofproto-dpif-mirror.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-ofproto-dpif-mirror.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-mirror.Tpo -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-mirror.lo `test -f 'ofproto/ofproto-dpif-mirror.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-mirror.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-mirror.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-mirror.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/ofproto-dpif-mirror.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-mirror.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/ofproto-dpif-mirror.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-mirror.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-mirror.lo `test -f 'ofproto/ofproto-dpif-mirror.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-mirror.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-mirror.lo `test -f 'ofproto/ofproto-dpif-mirror.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-mirror.c
 
 ofproto/ofproto_libofproto_la-ofproto-dpif-monitor.lo: ofproto/ofproto-dpif-monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-ofproto-dpif-monitor.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-monitor.Tpo -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-monitor.lo `test -f 'ofproto/ofproto-dpif-monitor.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-monitor.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-monitor.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/ofproto-dpif-monitor.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-monitor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/ofproto-dpif-monitor.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-monitor.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-monitor.lo `test -f 'ofproto/ofproto-dpif-monitor.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-monitor.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-monitor.lo `test -f 'ofproto/ofproto-dpif-monitor.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-monitor.c
 
 ofproto/ofproto_libofproto_la-ofproto-dpif-rid.lo: ofproto/ofproto-dpif-rid.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-ofproto-dpif-rid.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-rid.Tpo -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-rid.lo `test -f 'ofproto/ofproto-dpif-rid.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-rid.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-rid.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-rid.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/ofproto-dpif-rid.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-rid.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/ofproto-dpif-rid.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-rid.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-rid.lo `test -f 'ofproto/ofproto-dpif-rid.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-rid.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-rid.lo `test -f 'ofproto/ofproto-dpif-rid.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-rid.c
 
 ofproto/ofproto_libofproto_la-ofproto-dpif-sflow.lo: ofproto/ofproto-dpif-sflow.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-ofproto-dpif-sflow.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-sflow.Tpo -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-sflow.lo `test -f 'ofproto/ofproto-dpif-sflow.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-sflow.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-sflow.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-sflow.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/ofproto-dpif-sflow.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-sflow.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/ofproto-dpif-sflow.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-sflow.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-sflow.lo `test -f 'ofproto/ofproto-dpif-sflow.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-sflow.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-sflow.lo `test -f 'ofproto/ofproto-dpif-sflow.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-sflow.c
 
 ofproto/ofproto_libofproto_la-ofproto-dpif-upcall.lo: ofproto/ofproto-dpif-upcall.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-ofproto-dpif-upcall.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-upcall.Tpo -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-upcall.lo `test -f 'ofproto/ofproto-dpif-upcall.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-upcall.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-upcall.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-upcall.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/ofproto-dpif-upcall.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-upcall.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/ofproto-dpif-upcall.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-upcall.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-upcall.lo `test -f 'ofproto/ofproto-dpif-upcall.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-upcall.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-upcall.lo `test -f 'ofproto/ofproto-dpif-upcall.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-upcall.c
 
 ofproto/ofproto_libofproto_la-ofproto-dpif-xlate.lo: ofproto/ofproto-dpif-xlate.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-ofproto-dpif-xlate.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-xlate.Tpo -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-xlate.lo `test -f 'ofproto/ofproto-dpif-xlate.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-xlate.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-xlate.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-ofproto-dpif-xlate.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/ofproto-dpif-xlate.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-xlate.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/ofproto-dpif-xlate.c' object='ofproto/ofproto_libofproto_la-ofproto-dpif-xlate.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-xlate.lo `test -f 'ofproto/ofproto-dpif-xlate.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-xlate.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-ofproto-dpif-xlate.lo `test -f 'ofproto/ofproto-dpif-xlate.c' || echo '$(srcdir)/'`ofproto/ofproto-dpif-xlate.c
 
 ofproto/ofproto_libofproto_la-pktbuf.lo: ofproto/pktbuf.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-pktbuf.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-pktbuf.Tpo -c -o ofproto/ofproto_libofproto_la-pktbuf.lo `test -f 'ofproto/pktbuf.c' || echo '$(srcdir)/'`ofproto/pktbuf.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-pktbuf.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-pktbuf.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/pktbuf.c' object='ofproto/ofproto_libofproto_la-pktbuf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/pktbuf.c' object='ofproto/ofproto_libofproto_la-pktbuf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-pktbuf.lo `test -f 'ofproto/pktbuf.c' || echo '$(srcdir)/'`ofproto/pktbuf.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-pktbuf.lo `test -f 'ofproto/pktbuf.c' || echo '$(srcdir)/'`ofproto/pktbuf.c
 
 ofproto/ofproto_libofproto_la-pinsched.lo: ofproto/pinsched.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-pinsched.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-pinsched.Tpo -c -o ofproto/ofproto_libofproto_la-pinsched.lo `test -f 'ofproto/pinsched.c' || echo '$(srcdir)/'`ofproto/pinsched.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-pinsched.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-pinsched.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/pinsched.c' object='ofproto/ofproto_libofproto_la-pinsched.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/pinsched.c' object='ofproto/ofproto_libofproto_la-pinsched.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-pinsched.lo `test -f 'ofproto/pinsched.c' || echo '$(srcdir)/'`ofproto/pinsched.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-pinsched.lo `test -f 'ofproto/pinsched.c' || echo '$(srcdir)/'`ofproto/pinsched.c
 
 ofproto/ofproto_libofproto_la-tunnel.lo: ofproto/tunnel.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-tunnel.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-tunnel.Tpo -c -o ofproto/ofproto_libofproto_la-tunnel.lo `test -f 'ofproto/tunnel.c' || echo '$(srcdir)/'`ofproto/tunnel.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-tunnel.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-tunnel.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/tunnel.c' object='ofproto/ofproto_libofproto_la-tunnel.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/tunnel.c' object='ofproto/ofproto_libofproto_la-tunnel.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-tunnel.lo `test -f 'ofproto/tunnel.c' || echo '$(srcdir)/'`ofproto/tunnel.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-tunnel.lo `test -f 'ofproto/tunnel.c' || echo '$(srcdir)/'`ofproto/tunnel.c
 
 ofproto/ofproto_libofproto_la-bundles.lo: ofproto/bundles.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -MT ofproto/ofproto_libofproto_la-bundles.lo -MD -MP -MF ofproto/$(DEPDIR)/ofproto_libofproto_la-bundles.Tpo -c -o ofproto/ofproto_libofproto_la-bundles.lo `test -f 'ofproto/bundles.c' || echo '$(srcdir)/'`ofproto/bundles.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ofproto/$(DEPDIR)/ofproto_libofproto_la-bundles.Tpo ofproto/$(DEPDIR)/ofproto_libofproto_la-bundles.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ofproto/bundles.c' object='ofproto/ofproto_libofproto_la-bundles.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ofproto/bundles.c' object='ofproto/ofproto_libofproto_la-bundles.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-bundles.lo `test -f 'ofproto/bundles.c' || echo '$(srcdir)/'`ofproto/bundles.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ofproto_libofproto_la_CPPFLAGS) $(CPPFLAGS) $(ofproto_libofproto_la_CFLAGS) $(CFLAGS) -c -o ofproto/ofproto_libofproto_la-bundles.lo `test -f 'ofproto/bundles.c' || echo '$(srcdir)/'`ofproto/bundles.c
 
 ovsdb/ovsdb_libovsdb_la-column.lo: ovsdb/column.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-column.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-column.Tpo -c -o ovsdb/ovsdb_libovsdb_la-column.lo `test -f 'ovsdb/column.c' || echo '$(srcdir)/'`ovsdb/column.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-column.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-column.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/column.c' object='ovsdb/ovsdb_libovsdb_la-column.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/column.c' object='ovsdb/ovsdb_libovsdb_la-column.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-column.lo `test -f 'ovsdb/column.c' || echo '$(srcdir)/'`ovsdb/column.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-column.lo `test -f 'ovsdb/column.c' || echo '$(srcdir)/'`ovsdb/column.c
 
 ovsdb/ovsdb_libovsdb_la-condition.lo: ovsdb/condition.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-condition.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-condition.Tpo -c -o ovsdb/ovsdb_libovsdb_la-condition.lo `test -f 'ovsdb/condition.c' || echo '$(srcdir)/'`ovsdb/condition.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-condition.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-condition.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/condition.c' object='ovsdb/ovsdb_libovsdb_la-condition.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/condition.c' object='ovsdb/ovsdb_libovsdb_la-condition.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-condition.lo `test -f 'ovsdb/condition.c' || echo '$(srcdir)/'`ovsdb/condition.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-condition.lo `test -f 'ovsdb/condition.c' || echo '$(srcdir)/'`ovsdb/condition.c
 
 ovsdb/ovsdb_libovsdb_la-execution.lo: ovsdb/execution.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-execution.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-execution.Tpo -c -o ovsdb/ovsdb_libovsdb_la-execution.lo `test -f 'ovsdb/execution.c' || echo '$(srcdir)/'`ovsdb/execution.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-execution.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-execution.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/execution.c' object='ovsdb/ovsdb_libovsdb_la-execution.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/execution.c' object='ovsdb/ovsdb_libovsdb_la-execution.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-execution.lo `test -f 'ovsdb/execution.c' || echo '$(srcdir)/'`ovsdb/execution.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-execution.lo `test -f 'ovsdb/execution.c' || echo '$(srcdir)/'`ovsdb/execution.c
 
 ovsdb/ovsdb_libovsdb_la-file.lo: ovsdb/file.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-file.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-file.Tpo -c -o ovsdb/ovsdb_libovsdb_la-file.lo `test -f 'ovsdb/file.c' || echo '$(srcdir)/'`ovsdb/file.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-file.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-file.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/file.c' object='ovsdb/ovsdb_libovsdb_la-file.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/file.c' object='ovsdb/ovsdb_libovsdb_la-file.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-file.lo `test -f 'ovsdb/file.c' || echo '$(srcdir)/'`ovsdb/file.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-file.lo `test -f 'ovsdb/file.c' || echo '$(srcdir)/'`ovsdb/file.c
 
 ovsdb/ovsdb_libovsdb_la-jsonrpc-server.lo: ovsdb/jsonrpc-server.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-jsonrpc-server.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-jsonrpc-server.Tpo -c -o ovsdb/ovsdb_libovsdb_la-jsonrpc-server.lo `test -f 'ovsdb/jsonrpc-server.c' || echo '$(srcdir)/'`ovsdb/jsonrpc-server.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-jsonrpc-server.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-jsonrpc-server.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/jsonrpc-server.c' object='ovsdb/ovsdb_libovsdb_la-jsonrpc-server.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/jsonrpc-server.c' object='ovsdb/ovsdb_libovsdb_la-jsonrpc-server.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-jsonrpc-server.lo `test -f 'ovsdb/jsonrpc-server.c' || echo '$(srcdir)/'`ovsdb/jsonrpc-server.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-jsonrpc-server.lo `test -f 'ovsdb/jsonrpc-server.c' || echo '$(srcdir)/'`ovsdb/jsonrpc-server.c
 
 ovsdb/ovsdb_libovsdb_la-log.lo: ovsdb/log.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-log.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-log.Tpo -c -o ovsdb/ovsdb_libovsdb_la-log.lo `test -f 'ovsdb/log.c' || echo '$(srcdir)/'`ovsdb/log.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-log.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-log.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/log.c' object='ovsdb/ovsdb_libovsdb_la-log.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/log.c' object='ovsdb/ovsdb_libovsdb_la-log.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-log.lo `test -f 'ovsdb/log.c' || echo '$(srcdir)/'`ovsdb/log.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-log.lo `test -f 'ovsdb/log.c' || echo '$(srcdir)/'`ovsdb/log.c
 
 ovsdb/ovsdb_libovsdb_la-mutation.lo: ovsdb/mutation.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-mutation.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-mutation.Tpo -c -o ovsdb/ovsdb_libovsdb_la-mutation.lo `test -f 'ovsdb/mutation.c' || echo '$(srcdir)/'`ovsdb/mutation.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-mutation.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-mutation.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/mutation.c' object='ovsdb/ovsdb_libovsdb_la-mutation.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/mutation.c' object='ovsdb/ovsdb_libovsdb_la-mutation.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-mutation.lo `test -f 'ovsdb/mutation.c' || echo '$(srcdir)/'`ovsdb/mutation.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-mutation.lo `test -f 'ovsdb/mutation.c' || echo '$(srcdir)/'`ovsdb/mutation.c
 
 ovsdb/ovsdb_libovsdb_la-ovsdb.lo: ovsdb/ovsdb.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-ovsdb.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-ovsdb.Tpo -c -o ovsdb/ovsdb_libovsdb_la-ovsdb.lo `test -f 'ovsdb/ovsdb.c' || echo '$(srcdir)/'`ovsdb/ovsdb.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-ovsdb.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-ovsdb.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/ovsdb.c' object='ovsdb/ovsdb_libovsdb_la-ovsdb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/ovsdb.c' object='ovsdb/ovsdb_libovsdb_la-ovsdb.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-ovsdb.lo `test -f 'ovsdb/ovsdb.c' || echo '$(srcdir)/'`ovsdb/ovsdb.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-ovsdb.lo `test -f 'ovsdb/ovsdb.c' || echo '$(srcdir)/'`ovsdb/ovsdb.c
 
 ovsdb/ovsdb_libovsdb_la-monitor.lo: ovsdb/monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-monitor.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-monitor.Tpo -c -o ovsdb/ovsdb_libovsdb_la-monitor.lo `test -f 'ovsdb/monitor.c' || echo '$(srcdir)/'`ovsdb/monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-monitor.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-monitor.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/monitor.c' object='ovsdb/ovsdb_libovsdb_la-monitor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/monitor.c' object='ovsdb/ovsdb_libovsdb_la-monitor.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-monitor.lo `test -f 'ovsdb/monitor.c' || echo '$(srcdir)/'`ovsdb/monitor.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-monitor.lo `test -f 'ovsdb/monitor.c' || echo '$(srcdir)/'`ovsdb/monitor.c
 
 ovsdb/ovsdb_libovsdb_la-query.lo: ovsdb/query.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-query.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-query.Tpo -c -o ovsdb/ovsdb_libovsdb_la-query.lo `test -f 'ovsdb/query.c' || echo '$(srcdir)/'`ovsdb/query.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-query.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-query.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/query.c' object='ovsdb/ovsdb_libovsdb_la-query.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/query.c' object='ovsdb/ovsdb_libovsdb_la-query.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-query.lo `test -f 'ovsdb/query.c' || echo '$(srcdir)/'`ovsdb/query.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-query.lo `test -f 'ovsdb/query.c' || echo '$(srcdir)/'`ovsdb/query.c
 
 ovsdb/ovsdb_libovsdb_la-row.lo: ovsdb/row.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-row.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-row.Tpo -c -o ovsdb/ovsdb_libovsdb_la-row.lo `test -f 'ovsdb/row.c' || echo '$(srcdir)/'`ovsdb/row.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-row.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-row.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/row.c' object='ovsdb/ovsdb_libovsdb_la-row.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/row.c' object='ovsdb/ovsdb_libovsdb_la-row.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-row.lo `test -f 'ovsdb/row.c' || echo '$(srcdir)/'`ovsdb/row.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-row.lo `test -f 'ovsdb/row.c' || echo '$(srcdir)/'`ovsdb/row.c
 
 ovsdb/ovsdb_libovsdb_la-server.lo: ovsdb/server.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-server.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-server.Tpo -c -o ovsdb/ovsdb_libovsdb_la-server.lo `test -f 'ovsdb/server.c' || echo '$(srcdir)/'`ovsdb/server.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-server.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-server.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/server.c' object='ovsdb/ovsdb_libovsdb_la-server.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/server.c' object='ovsdb/ovsdb_libovsdb_la-server.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-server.lo `test -f 'ovsdb/server.c' || echo '$(srcdir)/'`ovsdb/server.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-server.lo `test -f 'ovsdb/server.c' || echo '$(srcdir)/'`ovsdb/server.c
 
 ovsdb/ovsdb_libovsdb_la-table.lo: ovsdb/table.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-table.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-table.Tpo -c -o ovsdb/ovsdb_libovsdb_la-table.lo `test -f 'ovsdb/table.c' || echo '$(srcdir)/'`ovsdb/table.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-table.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-table.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/table.c' object='ovsdb/ovsdb_libovsdb_la-table.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/table.c' object='ovsdb/ovsdb_libovsdb_la-table.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-table.lo `test -f 'ovsdb/table.c' || echo '$(srcdir)/'`ovsdb/table.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-table.lo `test -f 'ovsdb/table.c' || echo '$(srcdir)/'`ovsdb/table.c
 
 ovsdb/ovsdb_libovsdb_la-trigger.lo: ovsdb/trigger.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-trigger.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-trigger.Tpo -c -o ovsdb/ovsdb_libovsdb_la-trigger.lo `test -f 'ovsdb/trigger.c' || echo '$(srcdir)/'`ovsdb/trigger.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-trigger.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-trigger.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/trigger.c' object='ovsdb/ovsdb_libovsdb_la-trigger.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/trigger.c' object='ovsdb/ovsdb_libovsdb_la-trigger.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-trigger.lo `test -f 'ovsdb/trigger.c' || echo '$(srcdir)/'`ovsdb/trigger.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-trigger.lo `test -f 'ovsdb/trigger.c' || echo '$(srcdir)/'`ovsdb/trigger.c
 
 ovsdb/ovsdb_libovsdb_la-transaction.lo: ovsdb/transaction.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -MT ovsdb/ovsdb_libovsdb_la-transaction.lo -MD -MP -MF ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-transaction.Tpo -c -o ovsdb/ovsdb_libovsdb_la-transaction.lo `test -f 'ovsdb/transaction.c' || echo '$(srcdir)/'`ovsdb/transaction.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-transaction.Tpo ovsdb/$(DEPDIR)/ovsdb_libovsdb_la-transaction.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ovsdb/transaction.c' object='ovsdb/ovsdb_libovsdb_la-transaction.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ovsdb/transaction.c' object='ovsdb/ovsdb_libovsdb_la-transaction.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-transaction.lo `test -f 'ovsdb/transaction.c' || echo '$(srcdir)/'`ovsdb/transaction.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ovsdb_libovsdb_la_CPPFLAGS) $(CPPFLAGS) $(ovsdb_libovsdb_la_CFLAGS) $(CFLAGS) -c -o ovsdb/ovsdb_libovsdb_la-transaction.lo `test -f 'ovsdb/transaction.c' || echo '$(srcdir)/'`ovsdb/transaction.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -4178,11 +3872,18 @@
 	-rm -f libtool config.lt
 install-man1: $(dist_man_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(dist_man_MANS) $(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -4211,16 +3912,21 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man5: $(dist_man_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-	@list=''; test -n "$(man5dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.5[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(dist_man_MANS) $(man_MANS)'; \
+	test -n "$(man5dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.5[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -4249,16 +3955,21 @@
 	  sed -n '/\.5[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(dist_man_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list=''; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(dist_man_MANS) $(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -4287,13 +3998,14 @@
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -4307,13 +4019,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
 install-dist_scriptsDATA: $(dist_scripts_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
 	@list='$(dist_scripts_DATA)'; test -n "$(scriptsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(scriptsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -4327,20 +4040,21 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_scripts_DATA)'; test -n "$(scriptsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(scriptsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(scriptsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(scriptsdir)'; $(am__uninstall_files_from_dir)
 install-nobase_pkgdataDATA: $(nobase_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(nobase_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
 	$(am__nobase_list) | while read dir files; do \
 	  xfiles=; for file in $$files; do \
 	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
 	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
 	  test -z "$$xfiles" || { \
 	    test "x$$dir" = x. || { \
-	      echo "$(MKDIR_P) '$(DESTDIR)$(pkgdatadir)/$$dir'"; \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)/$$dir"; }; \
 	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(pkgdatadir)/$$dir'"; \
 	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(pkgdatadir)/$$dir" || exit $$?; }; \
@@ -4350,13 +4064,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(nobase_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
 	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -4370,13 +4085,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -4390,13 +4106,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
 install-scriptsDATA: $(scripts_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
 	@list='$(scripts_DATA)'; test -n "$(scriptsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(scriptsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -4410,13 +4127,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(scripts_DATA)'; test -n "$(scriptsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(scriptsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(scriptsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(scriptsdir)'; $(am__uninstall_files_from_dir)
 install-openflowincludeHEADERS: $(openflowinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(openflowincludedir)" || $(MKDIR_P) "$(DESTDIR)$(openflowincludedir)"
 	@list='$(openflowinclude_HEADERS)'; test -n "$(openflowincludedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(openflowincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(openflowincludedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -4430,13 +4148,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(openflowinclude_HEADERS)'; test -n "$(openflowincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(openflowincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(openflowincludedir)" && rm -f $$files
+	dir='$(DESTDIR)$(openflowincludedir)'; $(am__uninstall_files_from_dir)
 install-openvswitchincludeHEADERS: $(openvswitchinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(openvswitchincludedir)" || $(MKDIR_P) "$(DESTDIR)$(openvswitchincludedir)"
 	@list='$(openvswitchinclude_HEADERS)'; test -n "$(openvswitchincludedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(openvswitchincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(openvswitchincludedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -4450,27 +4169,28 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(openvswitchinclude_HEADERS)'; test -n "$(openvswitchincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(openvswitchincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(openvswitchincludedir)" && rm -f $$files
+	dir='$(DESTDIR)$(openvswitchincludedir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -4485,57 +4205,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -4551,12 +4226,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -4568,15 +4238,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -4585,24 +4251,33 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -4636,13 +4311,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -4674,36 +4346,42 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -4714,8 +4392,8 @@
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -4725,17 +4403,19 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -4758,13 +4438,21 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -4806,10 +4494,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -4936,17 +4629,16 @@
 
 uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-	check-am ctags-recursive install install-am install-strip \
-	tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am all-local am--refresh check check-am check-local \
-	clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-local clean-noinstPROGRAMS \
-	clean-sbinPROGRAMS ctags ctags-recursive dist dist-all \
-	dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-compile \
+.MAKE: $(am__recursive_targets) all check check-am install install-am \
+	install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+	am--refresh check check-am check-local clean clean-binPROGRAMS \
+	clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
+	clean-local clean-noinstPROGRAMS clean-sbinPROGRAMS cscope \
+	cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-compile \
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
@@ -4967,7 +4659,7 @@
 	installcheck installcheck-am installdirs installdirs-am \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-completionSCRIPTS uninstall-dist_pkgdataDATA \
 	uninstall-dist_pkgdataSCRIPTS uninstall-dist_sbinSCRIPTS \
diff -Nru openvswitch-2.4.0/NEWS openvswitch-2.4.1/NEWS
--- openvswitch-2.4.0/NEWS	2015-08-21 17:00:17.867249599 +0000
+++ openvswitch-2.4.1/NEWS	2016-03-22 13:10:45.823878462 +0000
@@ -1,3 +1,8 @@
+v2.4.1 - 20 Aug 2015
+---------------------
+   - Fixes buffer overflow for crafted MPLS packets (CVE-2016-2074).
+   - Bug fixes
+
 v2.4.0 - 20 Aug 2015
 ---------------------
    - Flow table modifications are now atomic, meaning that each packet
diff -Nru openvswitch-2.4.0/ofproto/bond.c openvswitch-2.4.1/ofproto/bond.c
--- openvswitch-2.4.0/ofproto/bond.c	2015-08-21 00:18:21.766479269 +0000
+++ openvswitch-2.4.1/ofproto/bond.c	2016-03-22 13:09:54.450616546 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@
     void *aux;                  /* Client-provided handle for this slave. */
 
     struct netdev *netdev;      /* Network device, owned by the client. */
-    unsigned int change_seq;    /* Tracks changes in 'netdev'. */
+    uint64_t change_seq;        /* Tracks changes in 'netdev'. */
     ofp_port_t  ofp_port;       /* OpenFlow port number. */
     char *name;                 /* Name (a copy of netdev_get_name(netdev)). */
 
@@ -1068,23 +1068,24 @@
     }
 
     LIST_FOR_EACH (e, list_node, &from->entries) {
-        double old_ratio, new_ratio;
-        uint64_t delta;
-
-        if (to_tx_bytes == 0) {
-            /* Nothing on the new slave, move it. */
-            return e;
-        }
-
-        delta = e->tx_bytes;
-        old_ratio = (double)from->tx_bytes / to_tx_bytes;
-        new_ratio = (double)(from->tx_bytes - delta) / (to_tx_bytes + delta);
-        if (old_ratio - new_ratio > 0.1
-            && fabs(new_ratio - 1.0) < fabs(old_ratio - 1.0)) {
-            /* We're aiming for an ideal ratio of 1, meaning both the 'from'
-               and 'to' slave have the same load.  Therefore, we only move an
-               entry if it decreases the load on 'from', and brings us closer
-               to equal traffic load. */
+        uint64_t delta = e->tx_bytes;  /* The amount to rebalance.  */
+        uint64_t ideal_tx_bytes = (from->tx_bytes + to_tx_bytes)/2;
+                             /* Note, the ideal traffic is the mid point
+                              * between 'from' and 'to'. This value does
+                              * not change by rebalancing.  */
+        uint64_t new_low;    /* The lower bandwidth between 'to' and 'from'
+                                after rebalancing. */
+
+        new_low = MIN(from->tx_bytes - delta, to_tx_bytes + delta);
+
+        if ((new_low > to_tx_bytes) &&
+            (new_low - to_tx_bytes >= (ideal_tx_bytes - to_tx_bytes) / 10)) {
+            /* Only rebalance if the new 'low' is closer to to the mid point,
+             * and the improvement exceeds 10% of current traffic
+             * deviation from the ideal split.
+             *
+             * The improvement on the 'high' side is always the same as the
+             * 'low' side. Thus consider 'low' side is sufficient.  */
             return e;
         }
     }
diff -Nru openvswitch-2.4.0/ofproto/ofproto.c openvswitch-2.4.1/ofproto/ofproto.c
--- openvswitch-2.4.0/ofproto/ofproto.c	2015-08-21 00:18:21.946479263 +0000
+++ openvswitch-2.4.1/ofproto/ofproto.c	2016-03-22 13:09:54.458616747 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2015 Nicira, Inc.
+ * Copyright (c) 2009-2016 Nicira, Inc.
  * Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -212,7 +212,7 @@
 static void ofport_destroy__(struct ofport *) OVS_EXCLUDED(ofproto_mutex);
 static void ofport_destroy(struct ofport *);
 
-static void update_port(struct ofproto *, const char *devname);
+static int update_port(struct ofproto *, const char *devname);
 static int init_ports(struct ofproto *);
 static void reinit_ports(struct ofproto *);
 
@@ -291,7 +291,8 @@
 static bool ofproto_group_exists(const struct ofproto *ofproto,
                                  uint32_t group_id)
     OVS_EXCLUDED(ofproto->groups_rwlock);
-static enum ofperr add_group(struct ofproto *, struct ofputil_group_mod *);
+static enum ofperr add_group(struct ofproto *,
+                             const struct ofputil_group_mod *);
 static void handle_openflow(struct ofconn *, const struct ofpbuf *);
 static enum ofperr do_bundle_flow_mod_start(struct ofproto *,
                                             struct ofputil_flow_mod *,
@@ -1956,7 +1957,7 @@
 
         simap_put(&ofproto->ofp_requests, netdev_name,
                   ofp_to_u16(ofp_port));
-        update_port(ofproto, netdev_name);
+        error = update_port(ofproto, netdev_name);
     }
     if (ofp_portp) {
         *ofp_portp = OFPP_NONE;
@@ -2344,7 +2345,7 @@
 /* Adds an ofport to 'p' initialized based on the given 'netdev' and 'opp'.
  * The caller must ensure that 'p' does not have a conflicting ofport (that is,
  * one with the same name or port number). */
-static void
+static int
 ofport_install(struct ofproto *p,
                struct netdev *netdev, const struct ofputil_phy_port *pp)
 {
@@ -2378,7 +2379,7 @@
         goto error;
     }
     connmgr_send_port_status(p->connmgr, NULL, pp, OFPPR_ADD);
-    return;
+    return 0;
 
 error:
     VLOG_WARN_RL(&rl, "%s: could not add port %s (%s)",
@@ -2388,6 +2389,7 @@
     } else {
         netdev_close(netdev);
     }
+    return error;
 }
 
 /* Removes 'ofport' from 'p' and destroys it. */
@@ -2569,13 +2571,14 @@
     return error;
 }
 
-static void
+static int
 update_port(struct ofproto *ofproto, const char *name)
 {
     struct ofproto_port ofproto_port;
     struct ofputil_phy_port pp;
     struct netdev *netdev;
     struct ofport *port;
+    int error = 0;
 
     COVERAGE_INC(ofproto_update_port);
 
@@ -2615,13 +2618,15 @@
                 ofport_remove(port);
             }
             ofport_remove_with_name(ofproto, name);
-            ofport_install(ofproto, netdev, &pp);
+            error = ofport_install(ofproto, netdev, &pp);
         }
     } else {
         /* Any port named 'name' is gone now. */
         ofport_remove_with_name(ofproto, name);
     }
     ofproto_port_destroy(&ofproto_port);
+
+    return error;
 }
 
 static int
@@ -6197,7 +6202,7 @@
 }
 
 static enum ofperr
-init_group(struct ofproto *ofproto, struct ofputil_group_mod *gm,
+init_group(struct ofproto *ofproto, const struct ofputil_group_mod *gm,
            struct ofgroup **ofgroup)
 {
     enum ofperr error;
@@ -6223,7 +6228,9 @@
     *CONST_CAST(long long int *, &((*ofgroup)->modified)) = now;
     ovs_refcount_init(&(*ofgroup)->ref_count);
 
-    list_move(&(*ofgroup)->buckets, &gm->buckets);
+    list_init(&(*ofgroup)->buckets);
+    ofputil_bucket_clone_list(&(*ofgroup)->buckets, &gm->buckets, NULL);
+
     *CONST_CAST(uint32_t *, &(*ofgroup)->n_buckets) =
         list_size(&(*ofgroup)->buckets);
 
@@ -6243,7 +6250,7 @@
  * 'ofproto''s group table.  Returns 0 on success or an OpenFlow error code on
  * failure. */
 static enum ofperr
-add_group(struct ofproto *ofproto, struct ofputil_group_mod *gm)
+add_group(struct ofproto *ofproto, const struct ofputil_group_mod *gm)
 {
     struct ofgroup *ofgroup;
     enum ofperr error;
@@ -6317,22 +6324,24 @@
 
     ofputil_bucket_clone_list(&new_ofgroup->buckets, &ofgroup->buckets, NULL);
 
-    if (ofputil_bucket_check_duplicate_id(&ofgroup->buckets)) {
-            VLOG_WARN_RL(&rl, "Duplicate bucket id");
+    if (ofputil_bucket_check_duplicate_id(&new_ofgroup->buckets)) {
+            VLOG_INFO_RL(&rl, "Duplicate bucket id");
             return OFPERR_OFPGMFC_BUCKET_EXISTS;
     }
 
     /* Rearrange list according to command_bucket_id */
     if (command_bucket_id == OFPG15_BUCKET_LAST) {
-        struct ofputil_bucket *new_first;
-        const struct ofputil_bucket *first;
+        if (!list_is_empty(&ofgroup->buckets)) {
+            struct ofputil_bucket *new_first;
+            const struct ofputil_bucket *first;
 
-        first = ofputil_bucket_list_front(&ofgroup->buckets);
-        new_first = ofputil_bucket_find(&new_ofgroup->buckets,
-                                        first->bucket_id);
+            first = ofputil_bucket_list_front(&ofgroup->buckets);
+            new_first = ofputil_bucket_find(&new_ofgroup->buckets,
+                                            first->bucket_id);
 
-        list_splice(new_ofgroup->buckets.next, &new_first->list_node,
-                    &new_ofgroup->buckets);
+            list_splice(new_ofgroup->buckets.next, &new_first->list_node,
+                        &new_ofgroup->buckets);
+        }
     } else if (command_bucket_id <= OFPG15_BUCKET_MAX && last) {
         struct ofputil_bucket *after;
 
@@ -6389,7 +6398,7 @@
  * ofproto's ofgroup hash map. Thus, the group is never altered while users of
  * the xlate module hold a pointer to the group. */
 static enum ofperr
-modify_group(struct ofproto *ofproto, struct ofputil_group_mod *gm)
+modify_group(struct ofproto *ofproto, const struct ofputil_group_mod *gm)
 {
     struct ofgroup *ofgroup, *new_ofgroup, *retiring;
     enum ofperr error;
@@ -6463,6 +6472,7 @@
     flow_mod_init(&fm, &match, 0, NULL, 0, OFPFC_DELETE);
     fm.delete_reason = OFPRR_GROUP_DELETE;
     fm.out_group = ofgroup->group_id;
+    fm.table_id = OFPTT_ALL;
     handle_flow_mod__(ofproto, &fm, NULL);
 
     hmap_remove(&ofproto->groups, &ofgroup->hmap_node);
@@ -6532,28 +6542,37 @@
 
     switch (gm.command) {
     case OFPGC11_ADD:
-        return add_group(ofproto, &gm);
+        error = add_group(ofproto, &gm);
+        break;
 
     case OFPGC11_MODIFY:
-        return modify_group(ofproto, &gm);
+        error = modify_group(ofproto, &gm);
+        break;
 
     case OFPGC11_DELETE:
         delete_group(ofproto, gm.group_id);
-        return 0;
+        error = 0;
+        break;
 
     case OFPGC15_INSERT_BUCKET:
-        return modify_group(ofproto, &gm);
+        error = modify_group(ofproto, &gm);
+        break;
 
     case OFPGC15_REMOVE_BUCKET:
-        return modify_group(ofproto, &gm);
+        error = modify_group(ofproto, &gm);
+        break;
 
     default:
         if (gm.command > OFPGC11_DELETE) {
             VLOG_WARN_RL(&rl, "%s: Invalid group_mod command type %d",
                          ofproto->name, gm.command);
         }
-        return OFPERR_OFPGMFC_BAD_COMMAND;
+        error = OFPERR_OFPGMFC_BAD_COMMAND;
+        break;
     }
+    ofputil_bucket_list_destroy(&gm.buckets);
+
+    return error;
 }
 
 enum ofputil_table_miss
diff -Nru openvswitch-2.4.0/ofproto/ofproto-dpif.c openvswitch-2.4.1/ofproto/ofproto-dpif.c
--- openvswitch-2.4.0/ofproto/ofproto-dpif.c	2015-08-21 00:18:21.902479262 +0000
+++ openvswitch-2.4.1/ofproto/ofproto-dpif.c	2016-03-22 13:09:54.458616747 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -4887,6 +4887,7 @@
     xlate_actions(&trace.xin, &trace.xout);
 
     ds_put_char(ds, '\n');
+    trace.xin.flow.actset_output = 0;
     trace_format_flow(ds, 0, "Final flow", &trace);
     trace_format_megaflow(ds, 0, "Megaflow", &trace);
 
@@ -5139,6 +5140,8 @@
         ofproto_use_tnl_push_pop = true;
         unixctl_command_reply(conn, "Tunnel push-pop on");
         ofproto_revalidate_all_backers();
+    } else {
+        unixctl_command_reply_error(conn, "Invalid argument");
     }
 }
 
@@ -5485,6 +5488,7 @@
     fm.flags = OFPUTIL_FF_HIDDEN_FIELDS | OFPUTIL_FF_NO_READONLY;
     fm.ofpacts = ofpacts->data;
     fm.ofpacts_len = ofpacts->size;
+    fm.delete_reason = OVS_OFPRR_NONE;
 
     error = ofproto_flow_mod(&ofproto->up, &fm);
     if (error) {
diff -Nru openvswitch-2.4.0/ofproto/ofproto-dpif-ipfix.c openvswitch-2.4.1/ofproto/ofproto-dpif-ipfix.c
--- openvswitch-2.4.0/ofproto/ofproto-dpif-ipfix.c	2015-08-11 20:38:17.803305865 +0000
+++ openvswitch-2.4.1/ofproto/ofproto-dpif-ipfix.c	2016-03-22 13:09:54.454616648 +0000
@@ -1684,6 +1684,12 @@
     ipfix_cache_update(exporter, entry);
 }
 
+static bool
+bridge_exporter_enabled(struct dpif_ipfix *di)
+{
+    return di->bridge_exporter.probability > 0;
+}
+
 void
 dpif_ipfix_bridge_sample(struct dpif_ipfix *di, const struct dp_packet *packet,
                          const struct flow *flow,
@@ -1696,6 +1702,10 @@
     struct dpif_ipfix_port * tunnel_port = NULL;
 
     ovs_mutex_lock(&mutex);
+    if (!bridge_exporter_enabled(di)) {
+        ovs_mutex_unlock(&mutex);
+        return;
+    }
     /* Use the sampling probability as an approximation of the number
      * of matched packets. */
     packet_delta_count = UINT32_MAX / di->bridge_exporter.probability;
@@ -1832,7 +1842,7 @@
 
     ovs_mutex_lock(&mutex);
     get_export_time_now(&export_time_usec, &export_time_sec);
-    if (di->bridge_exporter.probability > 0) {  /* Bridge exporter enabled. */
+    if (bridge_exporter_enabled(di)) {
       dpif_ipfix_cache_expire(
           &di->bridge_exporter.exporter, false, export_time_usec,
           export_time_sec);
@@ -1852,7 +1862,7 @@
     struct dpif_ipfix_flow_exporter_map_node *flow_exporter_node;
 
     ovs_mutex_lock(&mutex);
-    if (di->bridge_exporter.probability > 0) {  /* Bridge exporter enabled. */
+    if (bridge_exporter_enabled(di)) {
         if (ipfix_cache_next_timeout_msec(
                 &di->bridge_exporter.exporter, &next_timeout_msec)) {
             poll_timer_wait_until(next_timeout_msec);
diff -Nru openvswitch-2.4.0/ofproto/ofproto-dpif-mirror.c openvswitch-2.4.1/ofproto/ofproto-dpif-mirror.c
--- openvswitch-2.4.0/ofproto/ofproto-dpif-mirror.c	2015-08-20 00:33:43.148979570 +0000
+++ openvswitch-2.4.1/ofproto/ofproto-dpif-mirror.c	2016-03-22 13:09:54.454616648 +0000
@@ -131,11 +131,13 @@
 }
 
 /* Returns true if configurations changes in 'mbridge''s mirrors require
- * revalidation. */
+ * revalidation, and resets the revalidation flag to false. */
 bool
 mbridge_need_revalidate(struct mbridge *mbridge)
 {
-    return mbridge->need_revalidate;
+    bool need_revalidate = mbridge->need_revalidate;
+    mbridge->need_revalidate = false;
+    return need_revalidate;
 }
 
 void
diff -Nru openvswitch-2.4.0/ofproto/ofproto-dpif-rid.c openvswitch-2.4.1/ofproto/ofproto-dpif-rid.c
--- openvswitch-2.4.0/ofproto/ofproto-dpif-rid.c	2015-08-21 00:18:21.790479267 +0000
+++ openvswitch-2.4.1/ofproto/ofproto-dpif-rid.c	2016-03-22 13:09:54.454616648 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 Nicira, Inc.
+ * Copyright (c) 2014, 2015, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,8 @@
 
 #define RECIRC_POOL_STATIC_IDS 1024
 
+static void recirc_id_node_free(struct recirc_id_node *);
+
 void
 recirc_init(void)
 {
@@ -88,7 +90,7 @@
          * finished. */
         LIST_FOR_EACH_POP (node, exp_node, &expired) {
             cmap_remove(&id_map, &node->id_node, node->id);
-            ovsrcu_postpone(free, node);
+            ovsrcu_postpone(recirc_id_node_free, node);
         }
 
         if (!list_is_empty(&expiring)) {
@@ -315,6 +317,13 @@
     return node->id;
 }
 
+static void
+recirc_id_node_free(struct recirc_id_node *node)
+{
+    ofpbuf_delete(node->stack);
+    free(node);
+}
+
 void
 recirc_id_node_unref(const struct recirc_id_node *node_)
     OVS_EXCLUDED(mutex)
diff -Nru openvswitch-2.4.0/ofproto/ofproto-dpif-sflow.c openvswitch-2.4.1/ofproto/ofproto-dpif-sflow.c
--- openvswitch-2.4.0/ofproto/ofproto-dpif-sflow.c	2015-08-21 00:18:21.794479267 +0000
+++ openvswitch-2.4.1/ofproto/ofproto-dpif-sflow.c	2016-03-22 13:09:54.454616648 +0000
@@ -122,7 +122,7 @@
 sflow_agent_alloc_cb(void *magic OVS_UNUSED, SFLAgent *agent OVS_UNUSED,
                      size_t bytes)
 {
-    return calloc(1, bytes);
+    return xzalloc(bytes);
 }
 
 /* sFlow library callback to free memory. */
diff -Nru openvswitch-2.4.0/ofproto/ofproto-dpif-upcall.c openvswitch-2.4.1/ofproto/ofproto-dpif-upcall.c
--- openvswitch-2.4.0/ofproto/ofproto-dpif-upcall.c	2015-08-21 00:18:21.806479266 +0000
+++ openvswitch-2.4.1/ofproto/ofproto-dpif-upcall.c	2016-03-22 13:09:54.454616648 +0000
@@ -1640,15 +1640,16 @@
 {
     uint64_t slow_path_buf[128 / 8];
     struct xlate_out xout, *xoutp;
+    struct flow_wildcards dp_mask;
     struct netflow *netflow;
     struct ofproto_dpif *ofproto;
     struct dpif_flow_stats push;
     struct ofpbuf xout_actions;
-    struct flow flow, dp_mask;
     uint64_t *dp64, *xout64;
     ofp_port_t ofp_in_port;
     struct xlate_in xin;
     long long int last_used;
+    struct flow flow;
     int error;
     size_t i;
     bool ok;
@@ -1745,7 +1746,7 @@
      * mask in the kernel is more specific i.e. less wildcarded, than what
      * we've calculated here.  This guarantees we don't catch any packets we
      * shouldn't with the megaflow. */
-    dp64 = (uint64_t *) &dp_mask;
+    dp64 = (uint64_t *) &dp_mask.masks;
     xout64 = (uint64_t *) &xout.wc.masks;
     for (i = 0; i < FLOW_U64S; i++) {
         if ((dp64[i] | xout64[i]) != dp64[i]) {
diff -Nru openvswitch-2.4.0/ofproto/ofproto-dpif-xlate.c openvswitch-2.4.1/ofproto/ofproto-dpif-xlate.c
--- openvswitch-2.4.0/ofproto/ofproto-dpif-xlate.c	2015-08-21 00:18:21.866479264 +0000
+++ openvswitch-2.4.1/ofproto/ofproto-dpif-xlate.c	2016-03-22 13:09:54.454616648 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+/* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -3431,17 +3431,16 @@
     bool use_masked;
 
     ctx->xout->slow |= SLOW_CONTROLLER;
+    use_masked = ctx->xbridge->support.masked_set_action;
+    ctx->xout->slow |= commit_odp_actions(&ctx->xin->flow, &ctx->base_flow,
+                                          ctx->xout->odp_actions,
+                                          &ctx->xout->wc, use_masked);
     if (!ctx->xin->packet) {
         return;
     }
 
     packet = dp_packet_clone(ctx->xin->packet);
 
-    use_masked = ctx->xbridge->support.masked_set_action;
-    ctx->xout->slow |= commit_odp_actions(&ctx->xin->flow, &ctx->base_flow,
-                                          ctx->xout->odp_actions,
-                                          &ctx->xout->wc, use_masked);
-
     odp_execute_actions(NULL, &packet, 1, false,
                         ctx->xout->odp_actions->data,
                         ctx->xout->odp_actions->size, NULL);
@@ -4008,8 +4007,7 @@
 
 /* Copy remaining actions to the action_set to be executed after recirculation.
  * UNROLL_XLATE action is inserted, if not already done so, before actions that
- * may generate PACKET_INs from the current table and without matching another
- * rule. */
+ * may depend on the current table ID or flow cookie. */
 static void
 recirc_unroll_actions(const struct ofpact *ofpacts, size_t ofpacts_len,
                       struct xlate_ctx *ctx)
@@ -4018,17 +4016,25 @@
 
     OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) {
         switch (a->type) {
-            /* May generate PACKET INs. */
         case OFPACT_OUTPUT_REG:
         case OFPACT_GROUP:
         case OFPACT_OUTPUT:
         case OFPACT_CONTROLLER:
         case OFPACT_DEC_MPLS_TTL:
         case OFPACT_DEC_TTL:
+            /* These actions may generate asynchronous messages, which include
+             * table ID and flow cookie information. */
             recirc_put_unroll_xlate(ctx);
             break;
 
-            /* These may not generate PACKET INs. */
+        case OFPACT_RESUBMIT:
+            if (ofpact_get_RESUBMIT(a)->table_id == 0xff) {
+                /* This resubmit action is relative to the current table, so we
+                 * need to track what table that is.*/
+                recirc_put_unroll_xlate(ctx);
+            }
+            break;
+
         case OFPACT_SET_TUNNEL:
         case OFPACT_REG_MOVE:
         case OFPACT_SET_FIELD:
@@ -4036,8 +4042,7 @@
         case OFPACT_STACK_POP:
         case OFPACT_LEARN:
         case OFPACT_WRITE_METADATA:
-        case OFPACT_RESUBMIT:        /* May indirectly generate PACKET INs, */
-        case OFPACT_GOTO_TABLE:      /* but from a different table and rule. */
+        case OFPACT_GOTO_TABLE:
         case OFPACT_ENQUEUE:
         case OFPACT_SET_VLAN_VID:
         case OFPACT_SET_VLAN_PCP:
@@ -4068,11 +4073,12 @@
         case OFPACT_WRITE_ACTIONS:
         case OFPACT_METER:
         case OFPACT_SAMPLE:
+            /* These may not generate PACKET INs. */
             break;
 
-            /* These need not be copied for restoration. */
         case OFPACT_NOTE:
         case OFPACT_CONJUNCTION:
+            /* These need not be copied for restoration. */
             continue;
         }
         /* Copy the action over. */
@@ -4611,7 +4617,7 @@
 
         stream = fopen(filename, "r");
         if (!stream) {
-            VLOG_WARN("%s: open failed (%s)", filename, ovs_strerror(errno));
+            VLOG_INFO("%s: open failed (%s)", filename, ovs_strerror(errno));
         } else {
             if (fscanf(stream, "%d", &n) != 1) {
                 VLOG_WARN("%s: read error", filename);
diff -Nru openvswitch-2.4.0/ovsdb/jsonrpc-server.c openvswitch-2.4.1/ovsdb/jsonrpc-server.c
--- openvswitch-2.4.0/ovsdb/jsonrpc-server.c	2015-08-11 20:38:17.959311461 +0000
+++ openvswitch-2.4.1/ovsdb/jsonrpc-server.c	2016-03-22 13:09:54.462616844 +0000
@@ -1238,7 +1238,7 @@
     dbmon = ovsdb_monitor_add(m->dbmon);
     if (dbmon != m->dbmon) {
         /* Found an exisiting dbmon, reuse the current one. */
-        ovsdb_monitor_remove_jsonrpc_monitor(m->dbmon, m);
+        ovsdb_monitor_remove_jsonrpc_monitor(m->dbmon, m, m->unflushed);
         ovsdb_monitor_add_jsonrpc_monitor(dbmon, m);
         m->dbmon = dbmon;
     }
@@ -1316,7 +1316,7 @@
 {
     json_destroy(m->monitor_id);
     hmap_remove(&m->session->monitors, &m->node);
-    ovsdb_monitor_remove_jsonrpc_monitor(m->dbmon, m);
+    ovsdb_monitor_remove_jsonrpc_monitor(m->dbmon, m, m->unflushed);
     free(m);
 }
 
diff -Nru openvswitch-2.4.0/ovsdb/libovsdb.pc.in openvswitch-2.4.1/ovsdb/libovsdb.pc.in
--- openvswitch-2.4.0/ovsdb/libovsdb.pc.in	2015-08-11 20:38:17.967311747 +0000
+++ openvswitch-2.4.1/ovsdb/libovsdb.pc.in	2016-03-22 13:09:54.462616844 +0000
@@ -3,7 +3,7 @@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libofproto
+Name: libovsdb
 Description: OVSDB library of Open vSwitch
 Version: @VERSION@
 Libs: -L${libdir} -lovsdb
diff -Nru openvswitch-2.4.0/ovsdb/monitor.c openvswitch-2.4.1/ovsdb/monitor.c
--- openvswitch-2.4.0/ovsdb/monitor.c	2015-08-21 00:18:21.966479262 +0000
+++ openvswitch-2.4.1/ovsdb/monitor.c	2016-03-22 13:09:54.462616844 +0000
@@ -763,7 +763,8 @@
 
 void
 ovsdb_monitor_remove_jsonrpc_monitor(struct ovsdb_monitor *dbmon,
-                   struct ovsdb_jsonrpc_monitor *jsonrpc_monitor)
+                   struct ovsdb_jsonrpc_monitor *jsonrpc_monitor,
+                   uint64_t unflushed)
 {
     struct jsonrpc_monitor_node *jm;
 
@@ -775,6 +776,12 @@
     /* Find and remove the jsonrpc monitor from the list.  */
     LIST_FOR_EACH(jm, node, &dbmon->jsonrpc_monitors) {
         if (jm->jsonrpc_monitor == jsonrpc_monitor) {
+            /* Release the tracked changes. */
+            struct shash_node *node;
+            SHASH_FOR_EACH (node, &dbmon->tables) {
+                struct ovsdb_monitor_table *mt = node->data;
+                ovsdb_monitor_table_untrack_changes(mt, unflushed);
+            }
             list_remove(&jm->node);
             free(jm);
 
diff -Nru openvswitch-2.4.0/ovsdb/monitor.h openvswitch-2.4.1/ovsdb/monitor.h
--- openvswitch-2.4.0/ovsdb/monitor.h	2015-08-11 20:38:17.971311891 +0000
+++ openvswitch-2.4.1/ovsdb/monitor.h	2016-03-22 13:09:54.462616844 +0000
@@ -36,10 +36,8 @@
                        struct ovsdb_jsonrpc_monitor *jsonrpc_monitor);
 
 void ovsdb_monitor_remove_jsonrpc_monitor(struct ovsdb_monitor *dbmon,
-                       struct ovsdb_jsonrpc_monitor *jsonrpc_monitor);
-
-void ovsdb_monitor_remove_jsonrpc_monitor(struct ovsdb_monitor *dbmon,
-                               struct ovsdb_jsonrpc_monitor *jsonrpc_monitor);
+                               struct ovsdb_jsonrpc_monitor *jsonrpc_monitor,
+                               uint64_t unflushed);
 
 void ovsdb_monitor_add_table(struct ovsdb_monitor *m,
                              const struct ovsdb_table *table);
diff -Nru openvswitch-2.4.0/ovsdb/transaction.c openvswitch-2.4.1/ovsdb/transaction.c
--- openvswitch-2.4.0/ovsdb/transaction.c	2015-08-21 00:18:21.970479262 +0000
+++ openvswitch-2.4.1/ovsdb/transaction.c	2016-03-22 13:09:54.462616844 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+/* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -533,7 +533,6 @@
         }
 
         if (datum->n != orig_n) {
-            bitmap_set1(txn_row->changed, OVSDB_COL_VERSION);
             bitmap_set1(txn_row->changed, column->index);
             ovsdb_datum_sort_assert(datum, column->type.key.type);
             if (datum->n < column->type.n_min) {
@@ -747,6 +746,21 @@
     return NULL;
 }
 
+static struct ovsdb_error * OVS_WARN_UNUSED_RESULT
+update_version(struct ovsdb_txn *txn OVS_UNUSED, struct ovsdb_txn_row *txn_row)
+{
+    struct ovsdb_table *table = txn_row->table;
+    size_t n_columns = shash_count(&table->schema->columns);
+
+    if (txn_row->old && txn_row->new
+        && !bitmap_is_all_zeros(txn_row->changed, n_columns)) {
+        bitmap_set1(txn_row->changed, OVSDB_COL_VERSION);
+        uuid_generate(ovsdb_row_get_version_rw(txn_row->new));
+    }
+
+    return NULL;
+}
+
 struct ovsdb_error *
 ovsdb_txn_commit(struct ovsdb_txn *txn, bool durable)
 {
@@ -800,6 +814,12 @@
         return error;
     }
 
+    /* Update _version for rows that changed.  */
+    error = for_each_txn_row(txn, update_version);
+    if (error) {
+        return OVSDB_WRAP_BUG("can't happen", error);
+    }
+
     /* Send the commit to each replica. */
     LIST_FOR_EACH (replica, node, &txn->db->replicas) {
         error = (replica->class->commit)(replica, txn, durable);
@@ -905,7 +925,6 @@
 
         rw_row = ovsdb_row_clone(ro_row);
         rw_row->n_refs = ro_row->n_refs;
-        uuid_generate(ovsdb_row_get_version_rw(rw_row));
         ovsdb_txn_row_create(txn, table, ro_row, rw_row);
         hmap_replace(&table->rows, &ro_row->hmap_node, &rw_row->hmap_node);
 
diff -Nru openvswitch-2.4.0/package.m4 openvswitch-2.4.1/package.m4
--- openvswitch-2.4.0/package.m4	2015-08-21 17:02:38.929245620 +0000
+++ openvswitch-2.4.1/package.m4	2016-03-22 13:11:12.336529491 +0000
@@ -1,6 +1,6 @@
 # Signature of the current package.
 m4_define([AT_PACKAGE_NAME],      [openvswitch])
 m4_define([AT_PACKAGE_TARNAME],   [openvswitch])
-m4_define([AT_PACKAGE_VERSION],   [2.4.0])
-m4_define([AT_PACKAGE_STRING],    [openvswitch 2.4.0])
+m4_define([AT_PACKAGE_VERSION],   [2.4.1])
+m4_define([AT_PACKAGE_STRING],    [openvswitch 2.4.1])
 m4_define([AT_PACKAGE_BUGREPORT], [bugs@openvswitch.org])
diff -Nru openvswitch-2.4.0/python/ovs/version.py openvswitch-2.4.1/python/ovs/version.py
--- openvswitch-2.4.0/python/ovs/version.py	2015-08-21 17:02:38.889245621 +0000
+++ openvswitch-2.4.1/python/ovs/version.py	2016-03-22 13:11:22.004766950 +0000
@@ -1,2 +1,2 @@
 # Generated automatically -- do not modify!    -*- buffer-read-only: t -*-
-VERSION = "2.4.0"
+VERSION = "2.4.1"
diff -Nru openvswitch-2.4.0/rhel/openvswitch-dkms.spec openvswitch-2.4.1/rhel/openvswitch-dkms.spec
--- openvswitch-2.4.0/rhel/openvswitch-dkms.spec	2015-08-21 17:02:38.953245620 +0000
+++ openvswitch-2.4.1/rhel/openvswitch-dkms.spec	2016-03-22 13:11:21.948765575 +0000
@@ -11,7 +11,7 @@
 %define oname openvswitch
 
 Name:             %{oname}-dkms
-Version:          2.4.0
+Version:          2.4.1
 Release:          1%{?dist}
 Summary:          Open vSwitch kernel module
 
diff -Nru openvswitch-2.4.0/rhel/openvswitch-fedora.spec openvswitch-2.4.1/rhel/openvswitch-fedora.spec
--- openvswitch-2.4.0/rhel/openvswitch-fedora.spec	2015-08-21 17:02:38.985245619 +0000
+++ openvswitch-2.4.1/rhel/openvswitch-fedora.spec	2016-03-22 13:11:21.988766557 +0000
@@ -17,11 +17,17 @@
 # Enable PIE, bz#955181
 %global _hardened_build 1
 
+# some distros (e.g: RHEL-7) don't define _rundir macro yet
+# Fedora 15 onwards uses /run as _rundir
+%if 0%{!?_rundir:1}
+%define _rundir /run
+%endif
+
 Name: openvswitch
 Summary: Open vSwitch
 Group: System Environment/Daemons
 URL: http://www.openvswitch.org/
-Version: 2.4.0
+Version: 2.4.1
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
diff -Nru openvswitch-2.4.0/rhel/openvswitch-fedora.spec.in openvswitch-2.4.1/rhel/openvswitch-fedora.spec.in
--- openvswitch-2.4.0/rhel/openvswitch-fedora.spec.in	2015-08-21 00:18:22.006479260 +0000
+++ openvswitch-2.4.1/rhel/openvswitch-fedora.spec.in	2016-03-22 13:09:54.462616844 +0000
@@ -16,6 +16,12 @@
 # Enable PIE, bz#955181
 %global _hardened_build 1
 
+# some distros (e.g: RHEL-7) don't define _rundir macro yet
+# Fedora 15 onwards uses /run as _rundir
+%if 0%{!?_rundir:1}
+%define _rundir /run
+%endif
+
 Name: openvswitch
 Summary: Open vSwitch
 Group: System Environment/Daemons
diff -Nru openvswitch-2.4.0/rhel/openvswitch-kmod-fedora.spec openvswitch-2.4.1/rhel/openvswitch-kmod-fedora.spec
--- openvswitch-2.4.0/rhel/openvswitch-kmod-fedora.spec	2015-08-21 17:02:38.969245619 +0000
+++ openvswitch-2.4.1/rhel/openvswitch-kmod-fedora.spec	2016-03-22 13:11:21.964765968 +0000
@@ -17,7 +17,7 @@
 Group: System Environment/Daemons
 URL: http://www.openvswitch.org/
 Vendor: OpenSource Security Ralf Spenneberg 
-Version: 2.4.0
+Version: 2.4.1
 
 # The entire source code is ASL 2.0 except datapath/ which is GPLv2
 License: GPLv2
diff -Nru openvswitch-2.4.0/rhel/openvswitch-kmod-rhel6.spec openvswitch-2.4.1/rhel/openvswitch-kmod-rhel6.spec
--- openvswitch-2.4.0/rhel/openvswitch-kmod-rhel6.spec	2015-08-21 17:02:38.961245619 +0000
+++ openvswitch-2.4.1/rhel/openvswitch-kmod-rhel6.spec	2016-03-22 13:11:21.956765772 +0000
@@ -12,7 +12,7 @@
 %define oname openvswitch
 
 Name:           %{oname}-kmod
-Version:        2.4.0
+Version:        2.4.1
 Release:        1%{?dist}
 Summary:        Open vSwitch kernel module
 
diff -Nru openvswitch-2.4.0/rhel/openvswitch.spec openvswitch-2.4.1/rhel/openvswitch.spec
--- openvswitch-2.4.0/rhel/openvswitch.spec	2015-08-21 17:02:38.973245619 +0000
+++ openvswitch-2.4.1/rhel/openvswitch.spec	2016-03-22 13:11:21.968766067 +0000
@@ -17,7 +17,7 @@
 Group: System Environment/Daemons
 URL: http://www.openvswitch.org/
 Vendor: Nicira, Inc.
-Version: 2.4.0
+Version: 2.4.1
 
 License: ASL 2.0
 Release: 1
@@ -124,6 +124,7 @@
 
 %files
 %defattr(-,root,root)
+%dir /etc/openvswitch
 /etc/bash_completion.d/ovs-appctl-bashcomp.bash
 /etc/bash_completion.d/ovs-vsctl-bashcomp.bash
 /etc/init.d/openvswitch
diff -Nru openvswitch-2.4.0/rhel/openvswitch.spec.in openvswitch-2.4.1/rhel/openvswitch.spec.in
--- openvswitch-2.4.0/rhel/openvswitch.spec.in	2015-08-21 00:18:22.014479261 +0000
+++ openvswitch-2.4.1/rhel/openvswitch.spec.in	2016-03-22 13:09:54.462616844 +0000
@@ -123,6 +123,7 @@
 
 %files
 %defattr(-,root,root)
+%dir /etc/openvswitch
 /etc/bash_completion.d/ovs-appctl-bashcomp.bash
 /etc/bash_completion.d/ovs-vsctl-bashcomp.bash
 /etc/init.d/openvswitch
diff -Nru openvswitch-2.4.0/tests/automake.mk openvswitch-2.4.1/tests/automake.mk
--- openvswitch-2.4.0/tests/automake.mk	2015-08-21 00:18:22.018479261 +0000
+++ openvswitch-2.4.1/tests/automake.mk	2016-03-22 13:09:54.462616844 +0000
@@ -284,6 +284,7 @@
 	tests/test-ofpbuf.c \
 	tests/test-packets.c \
 	tests/test-random.c \
+	tests/test-rcu.c \
 	tests/test-reconnect.c \
 	tests/test-rstp.c \
 	tests/test-sflow.c \
diff -Nru openvswitch-2.4.0/tests/kmod-testsuite openvswitch-2.4.1/tests/kmod-testsuite
--- openvswitch-2.4.0/tests/kmod-testsuite	2015-08-21 17:02:48.545245376 +0000
+++ openvswitch-2.4.1/tests/kmod-testsuite	2016-03-22 13:11:20.440728537 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
-# Generated from tests/kmod-testsuite.at by GNU Autoconf 2.68.
+# Generated from tests/kmod-testsuite.at by GNU Autoconf 2.69.
 #
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
 #
 # This test suite is free software; the Free Software Foundation gives
 # unlimited permission to copy, distribute and modify it.
@@ -176,7 +176,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -221,21 +222,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -337,6 +342,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -458,6 +471,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -492,16 +509,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -513,28 +530,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -921,7 +918,7 @@
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-openvswitch 2.4.0 test suite test groups:
+openvswitch 2.4.1 test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -962,10 +959,10 @@
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (openvswitch 2.4.0)" &&
+  $as_echo "$as_me (openvswitch 2.4.1)" &&
   cat <<\_ATEOF || at_write_fail=1
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This test suite is free software; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
@@ -1156,11 +1153,11 @@
 
 # Banners and logs.
 $as_echo "## ----------------------------- ##
-## openvswitch 2.4.0 test suite. ##
+## openvswitch 2.4.1 test suite. ##
 ## ----------------------------- ##"
 {
   $as_echo "## ----------------------------- ##
-## openvswitch 2.4.0 test suite. ##
+## openvswitch 2.4.1 test suite. ##
 ## ----------------------------- ##"
   echo
 
@@ -1498,6 +1495,8 @@
 s/ n_bytes=0,//
 s/ idle_age=[0-9]*,//
 s/ hard_age=[0-9]*,//
+s/dp_hash=0x[0-9a-f]*\//dp_hash=0x0\//
+s/recirc_id=0x[0-9a-f]*,/recirc_id=0x0,/
 '
 }
 
@@ -2128,7 +2127,7 @@
   $as_echo "Please send $at_msg and all information you think might help:
 
    To: 
-   Subject: [openvswitch 2.4.0] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+   Subject: [openvswitch 2.4.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
@@ -2154,7 +2153,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:4: modprobe openvswitch"
 at_fn_check_prepare_trace "kmod-traffic.at:4"
 ( $at_check_trace; modprobe openvswitch
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2178,7 +2177,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:4: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "kmod-traffic.at:4"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2192,7 +2191,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:4: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "kmod-traffic.at:4"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -2214,7 +2213,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2229,7 +2228,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:4: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "kmod-traffic.at:4"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2244,7 +2243,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:4: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "kmod-traffic.at:4"
 ( $at_check_trace; ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -2276,7 +2275,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2292,7 +2291,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:4: ovs-vsctl -- add-br br0 -- set bridge br0 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set-fail-mode br0 standalone --  "
 at_fn_check_prepare_trace "kmod-traffic.at:4"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set-fail-mode br0 standalone --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2313,7 +2312,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:7: ip netns add at_ns0"
 at_fn_check_prepare_trace "kmod-traffic.at:7"
 ( $at_check_trace; ip netns add at_ns0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2340,7 +2339,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:7: ip netns add at_ns1"
 at_fn_check_prepare_trace "kmod-traffic.at:7"
 ( $at_check_trace; ip netns add at_ns1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2367,7 +2366,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:9: ip link add p0 type veth peer name ovs-p0"
 at_fn_check_prepare_trace "kmod-traffic.at:9"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2382,7 +2381,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:9: ip link set p0 netns at_ns0"
 at_fn_check_prepare_trace "kmod-traffic.at:9"
 ( $at_check_trace; ip link set p0 netns at_ns0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2397,7 +2396,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:9: ovs-vsctl add-port br0 ovs-p0"
 at_fn_check_prepare_trace "kmod-traffic.at:9"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2412,7 +2411,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:9: ip link set dev ovs-p0 up"
 at_fn_check_prepare_trace "kmod-traffic.at:9"
 ( $at_check_trace; ip link set dev ovs-p0 up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2427,7 +2426,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:9: ip netns exec at_ns0 ip addr add \"10.1.1.1/24\" dev p0"
 at_fn_check_prepare_trace "kmod-traffic.at:9"
 ( $at_check_trace; ip netns exec at_ns0 ip addr add "10.1.1.1/24" dev p0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2442,7 +2441,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:9: ip netns exec at_ns0 ip link set dev p0 up"
 at_fn_check_prepare_trace "kmod-traffic.at:9"
 ( $at_check_trace; ip netns exec at_ns0 ip link set dev p0 up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2459,7 +2458,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:10: ip link add p1 type veth peer name ovs-p1"
 at_fn_check_prepare_trace "kmod-traffic.at:10"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2474,7 +2473,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:10: ip link set p1 netns at_ns1"
 at_fn_check_prepare_trace "kmod-traffic.at:10"
 ( $at_check_trace; ip link set p1 netns at_ns1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2489,7 +2488,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:10: ovs-vsctl add-port br0 ovs-p1"
 at_fn_check_prepare_trace "kmod-traffic.at:10"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2504,7 +2503,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:10: ip link set dev ovs-p1 up"
 at_fn_check_prepare_trace "kmod-traffic.at:10"
 ( $at_check_trace; ip link set dev ovs-p1 up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2519,7 +2518,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:10: ip netns exec at_ns1 ip addr add \"10.1.1.2/24\" dev p1"
 at_fn_check_prepare_trace "kmod-traffic.at:10"
 ( $at_check_trace; ip netns exec at_ns1 ip addr add "10.1.1.2/24" dev p1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2534,7 +2533,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:10: ip netns exec at_ns1 ip link set dev p1 up"
 at_fn_check_prepare_trace "kmod-traffic.at:10"
 ( $at_check_trace; ip netns exec at_ns1 ip link set dev p1 up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2553,7 +2552,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:13: ip netns exec at_ns0 bash -c \"ping -q -c 3 -i 0.3 -w 2 10.1.1.2 > ping.output\""
 at_fn_check_prepare_trace "kmod-traffic.at:13"
 ( $at_check_trace; ip netns exec at_ns0 bash -c "ping -q -c 3 -i 0.3 -w 2 10.1.1.2 > ping.output"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2570,7 +2569,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:15: ovs-vsctl del-br br0"
 at_fn_check_prepare_trace "kmod-traffic.at:15"
 ( $at_check_trace; ovs-vsctl del-br br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2586,7 +2585,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:15: check_logs "
 at_fn_check_prepare_trace "kmod-traffic.at:15"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2602,7 +2601,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:15: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "kmod-traffic.at:15"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2618,7 +2617,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:15: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "kmod-traffic.at:15"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2642,7 +2641,7 @@
 
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -2658,7 +2657,7 @@
 $as_echo "$at_srcdir/kmod-traffic.at:15: modprobe -r openvswitch"
 at_fn_check_prepare_trace "kmod-traffic.at:15"
 ( $at_check_trace; modprobe -r openvswitch
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
diff -Nru openvswitch-2.4.0/tests/library.at openvswitch-2.4.1/tests/library.at
--- openvswitch-2.4.0/tests/library.at	2015-08-20 00:33:43.304985857 +0000
+++ openvswitch-2.4.1/tests/library.at	2016-03-22 13:09:54.466616941 +0000
@@ -213,3 +213,7 @@
 AT_SETUP([test ofpbuf module])
 AT_CHECK([ovstest test-ofpbuf], [0], [])
 AT_CLEANUP
+
+AT_SETUP([test rcu])
+AT_CHECK([ovstest test-rcu-quiesce], [0], [])
+AT_CLEANUP
diff -Nru openvswitch-2.4.0/tests/odp.at openvswitch-2.4.1/tests/odp.at
--- openvswitch-2.4.0/tests/odp.at	2015-08-21 00:18:22.038479260 +0000
+++ openvswitch-2.4.1/tests/odp.at	2016-03-22 13:09:54.466616941 +0000
@@ -287,11 +287,11 @@
 set(tunnel(tun_id=0xabcdef1234567890,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(df,csum,key)))
 set(tunnel(tun_id=0xabcdef1234567890,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)))
 tnl_pop(4)
-tnl_push(tnl_port(4),header(size=42,type=3,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=47,tos=0,ttl=64,frag=0x40),gre((flags=0x2000,proto=0x6558),key=0x1e241)),out_port(1))
-tnl_push(tnl_port(4),header(size=46,type=3,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=47,tos=0,ttl=64,frag=0x40),gre((flags=0xa000,proto=0x6558),csum=0x0,key=0x1e241)),out_port(1))
-tnl_push(tnl_port(6),header(size=50,type=4,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=4789,csum=0x0),vxlan(flags=0x8000000,vni=0x1c7)),out_port(1))
-tnl_push(tnl_port(6),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=6081,csum=0x0),geneve(oam,vni=0x1c7)),out_port(1))
-tnl_push(tnl_port(6),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=6081,csum=0xffff),geneve(vni=0x1c7)),out_port(1))
+tnl_push(tnl_port(4),header(size=42,type=3,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=47,tos=0,ttl=64,frag=0x4000),gre((flags=0x2000,proto=0x6558),key=0x1e241)),out_port(1))
+tnl_push(tnl_port(4),header(size=46,type=3,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=47,tos=0,ttl=64,frag=0x4000),gre((flags=0xa000,proto=0x6558),csum=0x0,key=0x1e241)),out_port(1))
+tnl_push(tnl_port(6),header(size=50,type=4,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=4789,csum=0x0),vxlan(flags=0x8000000,vni=0x1c7)),out_port(1))
+tnl_push(tnl_port(6),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=6081,csum=0x0),geneve(oam,vni=0x1c7)),out_port(1))
+tnl_push(tnl_port(6),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=6081,csum=0xffff),geneve(vni=0x1c7)),out_port(1))
 ])
 AT_CHECK_UNQUOTED([ovstest test-odp parse-actions < actions.txt], [0],
   [`cat actions.txt`
diff -Nru openvswitch-2.4.0/tests/ofp-print.at openvswitch-2.4.1/tests/ofp-print.at
--- openvswitch-2.4.0/tests/ofp-print.at	2015-08-21 00:18:22.058479261 +0000
+++ openvswitch-2.4.1/tests/ofp-print.at	2016-03-22 13:09:54.466616941 +0000
@@ -2027,7 +2027,7 @@
 AT_KEYWORDS([ofp-print OFPT_STATS_REPLY])
 AT_CHECK([ovs-ofctl ofp-print "\
 06 13 00 d8 00 00 00 02 00 07 00 00 00 00 00 00 \
-00 88 01 00 00 00 20 00 00 78 00 00 00 00 00 00 \
+00 c8 01 00 00 00 20 00 00 78 00 00 00 00 00 00 \
 00 28 00 10 00 00 00 00 00 00 00 10 00 00 00 01 \
 00 00 00 00 00 00 00 00 00 00 00 08 00 64 00 00 \
 00 01 00 08 00 00 00 01 \
@@ -2044,7 +2044,7 @@
 14 01 ff 00 00 00 00 00 \
 "], [0], [dnl
 OFPST_GROUP_DESC reply (OF1.5) (xid=0x2):
- group_id=8192,type=select,selection_method=hash,fields=ip_dst=255.255.255.0,nw_proto,tcp_src,bucket=bucket_id:0,weight:100,watch_port:1,actions=output:1,bucket=bucket_id:1,weight:200,watch_port:2,actions=output:2,bucket=bucket_id:2,weight:200,watch_port:3,actions=output:3
+ group_id=8192,type=select,selection_method=hash,fields(ip_dst=255.255.255.0,nw_proto,tcp_src),bucket=bucket_id:0,weight:100,watch_port:1,actions=output:1,bucket=bucket_id:1,weight:200,watch_port:2,actions=output:2,bucket=bucket_id:2,weight:200,watch_port:3,actions=output:3
 ])
 AT_CLEANUP
 
diff -Nru openvswitch-2.4.0/tests/ofproto.at openvswitch-2.4.1/tests/ofproto.at
--- openvswitch-2.4.0/tests/ofproto.at	2015-08-21 00:18:22.146479257 +0000
+++ openvswitch-2.4.1/tests/ofproto.at	2016-03-22 13:09:54.474617133 +0000
@@ -343,26 +343,29 @@
 AT_SETUP([ofproto - del group (OpenFlow 1.5)])
 OVS_VSWITCHD_START
 AT_DATA([groups.txt], [dnl
-group_id=1234,type=select,selection_method=hash,bucket=output:10,bucket=output:11
+group_id=1233,type=select,selection_method=hash,bucket=output:10,bucket=output:11
+group_id=1234,type=select,selection_method=hash,fields(eth_dst,ip_dst,tcp_dst),bucket=output:10,bucket=output:11
 group_id=1235,type=all,bucket=actions=output:12,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
 ])
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt])
 AT_CHECK([ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
 OFPST_GROUP_DESC reply (OF1.5):
- group_id=1234,type=select,selection_method=hash,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
+ group_id=1234,type=select,selection_method=hash,fields(eth_dst,ip_dst,tcp_dst),bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
 ])
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn del-groups br0 group_id=1234])
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
 OFPST_GROUP_DESC reply (OF1.5):
  group_id=1235,type=all,bucket=bucket_id:2,actions=output:12,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
+ group_id=1233,type=select,selection_method=hash,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
 ])
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn del-groups br0 group_id=1234])
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
 OFPST_GROUP_DESC reply (OF1.5):
  group_id=1235,type=all,bucket=bucket_id:2,actions=output:12,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
+ group_id=1233,type=select,selection_method=hash,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
 ])
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn del-groups br0], [0])
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout])
@@ -383,25 +386,25 @@
 AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-groups br0 groups.txt])
 AT_DATA([flows.txt], [dnl
 tcp actions=group:1234
-udp actions=group:1235
+table=2 udp actions=group:1235
 ])
 AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-flows br0 flows.txt])
 AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort],
 [0], [dnl
+ table=2, udp actions=group:1235
  tcp actions=group:1234
- udp actions=group:1235
 OFPST_FLOW reply (OF1.1):
 ])
 AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234])
 AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort],
 [0], [dnl
- udp actions=group:1235
+ table=2, udp actions=group:1235
 OFPST_FLOW reply (OF1.1):
 ])
 AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234])
 AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort],
 [0], [dnl
- udp actions=group:1235
+ table=2, udp actions=group:1235
 OFPST_FLOW reply (OF1.1):
 ])
 AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn del-groups br0])
@@ -417,33 +420,69 @@
 dnl Actions definition listed in both supported formats (w/ actions=)
 AT_SETUP([ofproto - insert buckets])
 OVS_VSWITCHD_START
+# Add group with no buckets.
 AT_DATA([groups.txt], [dnl
-group_id=1234,type=all,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11
+group_id=1234,type=all
 ])
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt])
 AT_CHECK([ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
 OFPST_GROUP_DESC reply (OF1.5):
+ group_id=1234,type=all
+])
+
+# Add two buckets, using "last".
+AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11])
+AT_CHECK([ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234], [0], [stdout])
+AT_CHECK([STRIP_XIDS stdout], [0], [dnl
+OFPST_GROUP_DESC reply (OF1.5):
+ group_id=1234,type=all,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11
+])
+
+# Start over again, then add two buckets using "first".
+AT_CHECK([ovs-ofctl -O OpenFlow15 --strict del-groups br0 group_id=1234])
+AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn add-group br0 group_id=1234,type=all])
+AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=first,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11])
+AT_CHECK([ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234], [0], [stdout])
+AT_CHECK([STRIP_XIDS stdout], [0], [dnl
+OFPST_GROUP_DESC reply (OF1.5):
  group_id=1234,type=all,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11
 ])
+
+# Add two more buckets before the existing ones.
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=first,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1])
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
 OFPST_GROUP_DESC reply (OF1.5):
  group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11
 ])
+
+# Add another bucket at the end.
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15])
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
 OFPST_GROUP_DESC reply (OF1.5):
  group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15
 ])
+
+# Verify that duplicate bucket IDs are rejected.
+AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15], [1], [], [stderr])
+AT_CHECK([STRIP_XIDS stderr | sed '/truncated/,$d'], [0], [dnl
+OFPT_ERROR (OF1.5): OFPGMFC_BUCKET_EXISTS
+OFPT_GROUP_MOD (OF1.5):
+])
+
+
+# Add another bucket just before bucket 15.
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=15])
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
 OFPST_GROUP_DESC reply (OF1.5):
  group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15
 ])
+
+# Add two more buckets just before bucket 11,
+# getting the command from a file.
 AT_DATA([buckets.txt], [dnl
 group_id=1234,command_bucket_id=11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13
 ])
@@ -453,6 +492,8 @@
 OFPST_GROUP_DESC reply (OF1.5):
  group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15
 ])
+
+# Add yet two more buckets.
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=15,bucket=bucket_id:20,actions=output:20,bucket=bucket_id:21,actions=output:21])
 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
@@ -1400,7 +1441,7 @@
    name=table$x
  done) > expout
 AT_CHECK([ovs-ofctl dump-tables br0], [0], [expout])
-OVS_VSWITCHD_STOP(["/cannot find route for controller/d"])
+OVS_VSWITCHD_STOP(["/240\.0\.0\.1/d"])
 AT_CLEANUP
 
 AT_SETUP([ofproto - flow table configuration (OpenFlow 1.2)])
diff -Nru openvswitch-2.4.0/tests/ofproto-dpif.at openvswitch-2.4.1/tests/ofproto-dpif.at
--- openvswitch-2.4.0/tests/ofproto-dpif.at	2015-08-21 00:18:22.114479258 +0000
+++ openvswitch-2.4.1/tests/ofproto-dpif.at	2016-03-22 13:09:54.474617133 +0000
@@ -186,7 +186,6 @@
 AT_CHECK([ovs-ofctl add-flows br-int flows.txt])
 
 # Sends a packet to trigger recirculation.
-# Should generate recirc_id(0x2),dp_hash(0xc1261ba2/0xff).
 AT_CHECK([ovs-appctl netdev-dummy/receive p5 "in_port(5),eth(src=50:54:00:00:00:05,dst=50:54:00:00:01:00),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1)"])
 
 # Collects flow stats.
@@ -194,8 +193,8 @@
 
 # Checks the flow stats in br1, should only be one flow with non-zero
 # 'n_packets' from internal table.
-AT_CHECK([ovs-appctl bridge/dump-flows br1 | ofctl_strip | grep -- "n_packets" | grep -- "table_id" | sed -e 's/dp_hash=0x[[0-9a-f]][[0-9a-f]]*/dp_hash=0x0/' -e 's/output:[[0-9]][[0-9]]*/output/'], [0], [dnl
-table_id=254, n_packets=1, n_bytes=64, priority=20,recirc_id=0x2,dp_hash=0x0/0xff,actions=output
+AT_CHECK([ovs-appctl bridge/dump-flows br1 | ofctl_strip | grep -- "n_packets" | grep -- "table_id" | sed -e 's/output:[[0-9]][[0-9]]*/output/'] , [0], [dnl
+table_id=254, n_packets=1, n_bytes=64, priority=20,recirc_id=0x0,dp_hash=0x0/0xff,actions=output
 ])
 
 # Checks the flow stats in br-int, should be only one match.
@@ -6690,3 +6689,14 @@
 ])
 OVS_VSWITCHD_STOP
 AT_CLEANUP
+
+AT_SETUP([ofproto-dpif - trace (unchanged)])
+OVS_VSWITCHD_START
+AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=1'], [0], [stdout])
+AT_CHECK([grep "Final flow:" stdout], [0], [Final flow: unchanged
+])
+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(100)'], [0], [stdout])
+AT_CHECK([grep "Final flow:" stdout], [0], [Final flow: unchanged
+])
+OVS_VSWITCHD_STOP
+AT_CLEANUP
diff -Nru openvswitch-2.4.0/tests/ofproto-macros.at openvswitch-2.4.1/tests/ofproto-macros.at
--- openvswitch-2.4.0/tests/ofproto-macros.at	2015-08-21 00:18:22.126479258 +0000
+++ openvswitch-2.4.1/tests/ofproto-macros.at	2016-03-22 13:09:54.474617133 +0000
@@ -12,6 +12,8 @@
 s/ n_bytes=0,//
 s/ idle_age=[0-9]*,//
 s/ hard_age=[0-9]*,//
+s/dp_hash=0x[0-9a-f]*\//dp_hash=0x0\//
+s/recirc_id=0x[0-9a-f]*,/recirc_id=0x0,/
 '
 }
 
diff -Nru openvswitch-2.4.0/tests/ovs-vswitchd.at openvswitch-2.4.1/tests/ovs-vswitchd.at
--- openvswitch-2.4.0/tests/ovs-vswitchd.at	2015-08-11 20:38:18.051314762 +0000
+++ openvswitch-2.4.1/tests/ovs-vswitchd.at	2016-03-22 13:09:54.474617133 +0000
@@ -153,3 +153,33 @@
 ])
 
 AT_CLEANUP
+
+dnl ----------------------------------------------------------------------
+AT_SETUP([ovs-vswitchd - do not create sockets with unsafe names])
+OVS_VSWITCHD_START
+
+# On Unix systems, test for sockets with "test -S".
+#
+# On Windows systems, we simulate a socket with a regular file that contains
+# a TCP port number, so use "test -f" there instead.
+if test $IS_WIN32 = yes; then
+   S=f
+else
+   S=S
+fi
+
+# Create a bridge with an ordinary name and make sure that the management
+# socket gets creatd.
+AT_CHECK([ovs-vsctl add-br a -- set bridge a datapath-type=dummy])
+AT_CHECK([test -$S a.mgmt])
+
+# Create a bridge with an unsafe name and make sure that the management
+# socket does not get created.
+mkdir b
+AT_CHECK([ovs-vsctl add-br b/c -- set bridge b/c datapath-type=dummy], [0],
+  [], [ovs-vsctl: Error detected while setting up 'b/c'.  See ovs-vswitchd log for details.
+])
+AT_CHECK([test ! -e b/c.mgmt])
+
+OVS_VSWITCHD_STOP(['/ignoring bridge with invalid name/d'])
+AT_CLEANUP
diff -Nru openvswitch-2.4.0/tests/test-odp.c openvswitch-2.4.1/tests/test-odp.c
--- openvswitch-2.4.0/tests/test-odp.c	2015-08-21 00:18:22.210479257 +0000
+++ openvswitch-2.4.1/tests/test-odp.c	2016-03-22 13:09:54.478617231 +0000
@@ -185,8 +185,7 @@
             struct minimatch minimatch;
 
             odp_flow_key_to_flow(odp_key.data, odp_key.size, &flow);
-            odp_flow_key_to_mask(odp_mask.data, odp_mask.size, &wc.masks,
-                                 &flow);
+            odp_flow_key_to_mask(odp_mask.data, odp_mask.size, &wc, &flow);
             match_init(&match, &flow, &wc);
 
             match_init(&match_filter, &flow_filter, &wc);
diff -Nru openvswitch-2.4.0/tests/test-rcu.c openvswitch-2.4.1/tests/test-rcu.c
--- openvswitch-2.4.0/tests/test-rcu.c	1970-01-01 00:00:00.000000000 +0000
+++ openvswitch-2.4.1/tests/test-rcu.c	2016-03-22 12:36:24.953261578 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#undef NDEBUG
+#include "fatal-signal.h"
+#include "ovs-rcu.h"
+#include "ovs-thread.h"
+#include "ovstest.h"
+#include "util.h"
+
+static void *
+quiescer_main(void *aux OVS_UNUSED)
+{
+    /* A new thread must be not be quiescent */
+    ovs_assert(!ovsrcu_is_quiescent());
+    ovsrcu_quiesce_start();
+    /* After the above call it must be quiescent */
+    ovs_assert(ovsrcu_is_quiescent());
+
+    return NULL;
+}
+
+static void
+test_rcu_quiesce(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+{
+    pthread_t quiescer;
+
+    fatal_signal_init();
+    quiescer = ovs_thread_create("quiescer", quiescer_main, NULL);
+
+    /* This is the main thread of the process. After spawning its first
+     * thread it must not be quiescent. */
+    ovs_assert(!ovsrcu_is_quiescent());
+
+    xpthread_join(quiescer, NULL);
+}
+
+OVSTEST_REGISTER("test-rcu-quiesce", test_rcu_quiesce);
diff -Nru openvswitch-2.4.0/tests/testsuite openvswitch-2.4.1/tests/testsuite
--- openvswitch-2.4.0/tests/testsuite	2015-08-21 17:02:57.229245156 +0000
+++ openvswitch-2.4.1/tests/testsuite	2016-03-22 13:11:20.292724901 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
-# Generated from tests/testsuite.at by GNU Autoconf 2.68.
+# Generated from tests/testsuite.at by GNU Autoconf 2.69.
 #
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
 #
 # This test suite is free software; the Free Software Foundation gives
 # unlimited permission to copy, distribute and modify it.
@@ -176,7 +176,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -221,21 +222,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -337,6 +342,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -458,6 +471,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -492,16 +509,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -513,28 +530,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -672,1590 +669,1593 @@
 61;library.at:204;test bitmap functions;;
 62;library.at:209;use of public headers;;
 63;library.at:213;test ofpbuf module;;
-64;heap.at:8;heap library -- insert delete same order;;
-65;heap.at:9;heap library -- insert delete reverse order;;
-66;heap.at:10;heap library -- insert delete every order;;
-67;heap.at:11;heap library -- insert delete same order with dups;;
-68;heap.at:12;heap library -- raw insert;;
-69;heap.at:13;heap library -- raw delete;;
-70;bundle.at:10;hrw bundle link selection;;
-71;bundle.at:80;active_backup bundle link selection;;
-72;bundle.at:151;hrw bundle single link selection;;
-73;bundle.at:159;hrw bundle no link selection;;
-74;bundle.at:166;bundle action missing argument;;
-75;bundle.at:172;bundle action bad fields;;
-76;bundle.at:178;bundle action bad algorithm;;
-77;bundle.at:184;bundle action bad slave type;;
-78;bundle.at:190;bundle action bad slave delimiter;;
-79;classifier.at:2;flow classifier - empty;;
-80;classifier.at:2;flow classifier - destroy null;;
-81;classifier.at:2;flow classifier - single rule;;
-82;classifier.at:2;flow classifier - rule replacement;;
-83;classifier.at:2;flow classifier - many rules in one list;;
-84;classifier.at:2;flow classifier - versioned many rules in one list;;
-85;classifier.at:2;flow classifier - many rules in one table;;
-86;classifier.at:2;flow classifier - versioned many rules in one table;;
-87;classifier.at:2;flow classifier - many rules in two tables;;
-88;classifier.at:2;flow classifier - versioned many rules in two tables;;
-89;classifier.at:2;flow classifier - many rules in five tables;;
-90;classifier.at:2;flow classifier - versioned many rules in five tables;;
-91;classifier.at:21;miniflow - miniflow;;
-92;classifier.at:21;miniflow - minimask_has_extra;;
-93;classifier.at:21;miniflow - minimask_combine;;
-94;classifier.at:31;flow classifier - lookup segmentation;;
-95;classifier.at:69;flow classifier - prefix lookup;;
-96;classifier.at:134;single conjunctive match;;
-97;classifier.at:171;multiple conjunctive match;;
-98;classifier.at:247;conjunctive match priority fallback;;
-99;classifier.at:293;conjunctive match and other actions;;
-100;check-structs.at:11;check struct tail padding;check-structs;
-101;check-structs.at:21;check struct internal alignment;check-structs;
-102;check-structs.at:32;check struct declared size;check-structs;
-103;check-structs.at:44;check wrong struct's declared size;check-structs;
-104;daemon.at:3;daemon;;
-105;daemon.at:22;daemon --monitor;;
-106;daemon.at:71;daemon --detach;;
-107;daemon.at:94;daemon --detach --monitor;;
-108;daemon.at:144;daemon --detach startup errors;;
-109;daemon.at:153;daemon --detach --monitor startup errors;;
-110;daemon.at:163;daemon --service;windows-service;
-111;daemon-py.at:3;daemon - Python;;
-112;daemon-py.at:21;daemon --monitor - Python;;
-113;daemon-py.at:64;daemon --monitor restart exit code - Python;;
-114;daemon-py.at:107;daemon --detach - Python;;
-115;daemon-py.at:123;daemon --detach --monitor - Python;;
-116;daemon-py.at:172;daemon --detach startup errors - Python;;
-117;daemon-py.at:181;daemon --detach --monitor startup errors - Python;;
-118;daemon-py.at:190;daemon --detach closes standard fds - Python;;
-119;daemon-py.at:210;daemon --detach --monitor closes standard fds;;
-120;ofp-actions.at:3;OpenFlow 1.0 action translation;ofp-actions of1.0;
-121;ofp-actions.at:153;OpenFlow 1.0 \"instruction\" translations;ofp-actions of1.0 instruction;
-122;ofp-actions.at:183;OpenFlow 1.1 action translation;ofp-actions of1.1;
-123;ofp-actions.at:320;OpenFlow 1.1 instruction translation;of1.1 instruction ofp-actions;
-124;ofp-actions.at:531;OpenFlow 1.2 action translation;ofp-actions of1.2;
-125;ofp-actions.at:557;OpenFlow 1.3 action translation;ofp-actions of1.3;
-126;ofp-actions.at:585;OpenFlow 1.5 action translation;ofp-actions of1.5;
-127;ofp-actions.at:609;ofp-actions - inconsistent MPLS actions;;
-128;ofp-actions.at:621;reg_load <-> set_field translation corner case;ofp-actions;
-129;ofp-print.at:3;empty;ofp-print;
-130;ofp-print.at:9;too short;ofp-print;
-131;ofp-print.at:17;wrong OpenFlow version;ofp-print;
-132;ofp-print.at:27;truncated message;ofp-print;
-133;ofp-print.at:35;message only uses part of buffer;ofp-print;
-134;ofp-print.at:44;OFPT_HELLO - ordinary;ofp-print;
-135;ofp-print.at:52;OFPT_HELLO with extra data;ofp-print;
-136;ofp-print.at:64;OFPT_HELLO with version bitmap;ofp-print;
-137;ofp-print.at:73;OFPT_HELLO with version bitmap and extra data;ofp-print;
-138;ofp-print.at:87;OFPT_HELLO with higher than supported version;ofp-print;
-139;ofp-print.at:106;OFPT_HELLO with contradictory version bitmaps;ofp-print;
-140;ofp-print.at:148;OFPT_ECHO_REQUEST, empty payload;ofp-print;
-141;ofp-print.at:155;OFPT_ECHO_REQUEST, 5-byte payload;ofp-print;
-142;ofp-print.at:163;OFPT_ECHO_REPLY, empty payload;ofp-print;
-143;ofp-print.at:170;OFPT_ECHO_REPLY, 5-byte payload;ofp-print;
-144;ofp-print.at:178;OFPT_FEATURES_REQUEST;ofp-print;
-145;ofp-print.at:185;OFPT_FEATURES_REPLY - OF1.0;ofp-print;
-146;ofp-print.at:235;OFPT_FEATURES_REPLY cut off mid-port - OF1.0;ofp-print;
-147;ofp-print.at:274;OFPT_FEATURES_REPLY - OF1.1;ofp-print;
-148;ofp-print.at:305;OFPT_FEATURES_REPLY cut off mid-port - OF1.1;ofp-print;
-149;ofp-print.at:334;OFPT_FEATURES_REPLY - OF1.2;ofp-print;
-150;ofp-print.at:365;OFPT_FEATURES_REPLY cut off mid-port - OF1.2;ofp-print;
-151;ofp-print.at:394;OFPT_FEATURES_REPLY - OF1.3;ofp-print;
-152;ofp-print.at:406;OFPT_FEATURES_REPLY - with auxiliary_id - OF1.3;ofp-print;
-153;ofp-print.at:418;OFPT_GET_CONFIG_REQUEST;ofp-print;
-154;ofp-print.at:425;OFPT_GET_CONFIG_REPLY, most common form;ofp-print;
-155;ofp-print.at:433;OFPT_GET_CONFIG_REPLY, frags and miss_send_len;ofp-print;
-156;ofp-print.at:440;OFPT_PACKET_IN - OF1.0;ofp-print;
-157;ofp-print.at:454;OFPT_PACKET_IN - OF1.0, with hex output of packet data;ofp-print;
-158;ofp-print.at:472;OFPT_PACKET_IN - OF1.1;ofp-print;
-159;ofp-print.at:487;OFPT_PACKET_IN - OF1.2;ofp-print;
-160;ofp-print.at:501;OFPT_PACKET_IN - OF1.2, with hex output of packet data;ofp-print;
-161;ofp-print.at:518;OFPT_PACKET_IN - OF1.3;ofp-print;
-162;ofp-print.at:533;OFPT_PACKET_IN - OF1.4;ofp-print;
-163;ofp-print.at:548;OFPT_PACKET_IN - OF1.5;ofp-print;
-164;ofp-print.at:563;OFPT_PACKET_IN - OF1.3, with hex output of packet data;ofp-print;
-165;ofp-print.at:581;OFPT_FLOW_REMOVED - OF1.0;ofp-print;
-166;ofp-print.at:595;OFPT_FLOW_REMOVED - OF1.2;ofp-print;
-167;ofp-print.at:606;OFPT_FLOW_REMOVED - OF1.3;ofp-print;
-168;ofp-print.at:617;OFPT_PORT_STATUS - OF1.0;ofp-print;
-169;ofp-print.at:635;OFPT_PORT_STATUS - OF1.1;ofp-print;
-170;ofp-print.at:654;OFPT_PORT_STATUS - OF1.4;ofp-print;
-171;ofp-print.at:674;OFPT_PACKET_OUT - OF1.0;ofp-print;
-172;ofp-print.at:688;OFPT_PACKET_OUT - OF1.0, with packet;ofp-print;
-173;ofp-print.at:703;OFPT_PACKET_OUT - OF1.0, with hex output of packet data;ofp-print;
-174;ofp-print.at:722;OFPT_PACKET_OUT - OF1.1;ofp-print;
-175;ofp-print.at:733;OFPT_PACKET_OUT - OF1.1, with packet;ofp-print;
-176;ofp-print.at:750;OFPT_FLOW_MOD - OF1.0 - low verbosity;ofp-print;
-177;ofp-print.at:768;OFPT_FLOW_MOD - OF1.1 - low verbosity;ofp-print;
-178;ofp-print.at:788;OFPT_FLOW_MOD - OF1.2 - low verbosity;ofp-print;
-179;ofp-print.at:808;OFPT_FLOW_MOD - OF1.0 - high verbosity;ofp-print;
-180;ofp-print.at:826;OFPT_FLOW_MOD - OF1.2 - low verbosity;ofp-print;
-181;ofp-print.at:845;OFPT_FLOW_MOD - OF1.3 - flags - low verbosity;ofp-print;
-182;ofp-print.at:863;OFPT_FLOW_MOD - OF1.2 - set-field ip_src;ofp-print;
-183;ofp-print.at:878;OFPT_FLOW_MOD - OF1.2 - set-field ip_dst;ofp-print;
-184;ofp-print.at:893;OFPT_FLOW_MOD - OF1.2 - set-field sctp_src;ofp-print;
-185;ofp-print.at:908;OFPT_FLOW_MOD - OF1.2 - set-field sctp_dst;ofp-print;
-186;ofp-print.at:923;OFPT_FLOW_MOD - OF1.2 - experimenter OXM;ofp-print;
-187;ofp-print.at:937;OFPT_FLOW_MOD - OF1.2 - set-field nd_target, nd_sll;ofp-print;
-188;ofp-print.at:955;OFPT_FLOW_MOD - OF1.3 - meter;ofp-print;
-189;ofp-print.at:966;OFPT_FLOW reply - OF1.2 - set-field ip_src;ofp-print;
-190;ofp-print.at:983;OFPT_FLOW reply - OF1.2 - set-field ip_dst;ofp-print;
-191;ofp-print.at:1000;OFPT_FLOW reply - OF1.2 - set-field sctp_src;ofp-print;
-192;ofp-print.at:1017;OFPT_FLOW reply - OF1.2 - set-field sctp_dst;ofp-print;
-193;ofp-print.at:1034;OFPT_PORT_MOD - OF1.0;ofp-print;
-194;ofp-print.at:1047;OFPT_PORT_MOD - OF1.1;ofp-print;
-195;ofp-print.at:1061;OFPT_PORT_MOD - OF1.2;ofp-print;
-196;ofp-print.at:1075;OFPT_PORT_MOD - OF1.3;ofp-print;
-197;ofp-print.at:1089;OFPT_PORT_MOD - OF1.4;ofp-print;
-198;ofp-print.at:1103;OFPT_TABLE_MOD - OF1.1;ofp-print;
-199;ofp-print.at:1112;OFPT_TABLE_MOD - OF1.2;ofp-print;
-200;ofp-print.at:1121;OFPT_TABLE_MOD - OF1.3;ofp-print;
-201;ofp-print.at:1130;OFPT_TABLE_MOD - OF1.4;ofp-print;
-202;ofp-print.at:1139;OFPST_DESC request;ofp-print ofpt_stats_request;
-203;ofp-print.at:1146;OFPST_DESC reply;ofp-print ofpt_stats_reply;
-204;ofp-print.at:1226;OFPST_FLOW request - OF1.0;ofp-print ofpt_stats_request;
-205;ofp-print.at:1238;OFPST_FLOW request - OF1.2;ofp-print ofpt_stats_request;
-206;ofp-print.at:1250;OFPST_FLOW request - OF1.3;ofp-print ofpt_stats_request;
-207;ofp-print.at:1262;OFPST_FLOW reply - OF1.0;ofp-print ofpt_stats_reply;
-208;ofp-print.at:1306;OFPST_FLOW reply - OF1.2;ofp-print ofpt_stats_reply;
-209;ofp-print.at:1341;OFPST_AGGREGATE request - OF1.0;ofp-print ofpt_stats_request;
-210;ofp-print.at:1353;OFPST_AGGREGATE request - OF1.2;ofp-print ofpt_stats_request;
-211;ofp-print.at:1365;OFPST_AGGREGATE request - OF1.3;ofp-print ofpt_stats_request;
-212;ofp-print.at:1377;OFPST_AGGREGATE reply - OF1.0;ofp-print ofpt_stats_reply;
-213;ofp-print.at:1388;OFPST_AGGREGATE reply - OF1.2;ofp-print ofpt_stats_reply;
-214;ofp-print.at:1399;OFPST_AGGREGATE reply - OF1.3;ofp-print ofpt_stats_reply;
-215;ofp-print.at:1410;OFPST_TABLE request - OF1.0;ofp-print ofpt_stats_request;
-216;ofp-print.at:1417;OFPST_TABLE request - OF1.1;ofp-print ofpt_stats_request;
-217;ofp-print.at:1424;OFPST_TABLE request - OF1.2;ofp-print ofpt_stats_request;
-218;ofp-print.at:1431;OFPST_TABLE request - OF1.3;ofp-print ofpt_stats_request;
-219;ofp-print.at:1438;OFPST_TABLE reply - OF1.0;ofp-print ofpt_stats_reply;
-220;ofp-print.at:1467;OFPST_TABLE reply - OF1.2;ofp-print ofpt_stats_reply;
-221;ofp-print.at:1559;OFPST_TABLE reply - OF1.3;ofp-print ofpt_stats_reply;
-222;ofp-print.at:1576;OFPST_PORT request - 1.0;ofp-print ofpt_stats_request;
-223;ofp-print.at:1586;OFPST_PORT request - 1.1;ofp-print ofpt_stats_request;
-224;ofp-print.at:1596;OFPST_PORT request - 1.2;ofp-print ofpt_stats_request;
-225;ofp-print.at:1606;OFPST_PORT request - 1.3;ofp-print ofpt_stats_request;
-226;ofp-print.at:1616;OFPST_PORT reply - OF1.0;ofp-print ofpt_stats_reply;
-227;ofp-print.at:1659;OFPST_PORT reply - OF1.2;ofp-print ofpt_stats_reply;
-228;ofp-print.at:1694;OFPST_PORT reply - OF1.3;ofp-print ofpt_stats_reply;
-229;ofp-print.at:1733;OFPST_PORT reply - OF1.4;ofp-print ofpt_stats_reply;
-230;ofp-print.at:1753;OFPST_QUEUE request - OF1.0;ofp-print ofpt_stats_request;
-231;ofp-print.at:1763;OFPST_QUEUE request - OF1.1;ofp-print ofpt_stats_request;
-232;ofp-print.at:1773;OFPST_QUEUE request - OF1.2;ofp-print ofpt_stats_request;
-233;ofp-print.at:1783;OFPST_QUEUE request - OF1.3;ofp-print ofpt_stats_request;
-234;ofp-print.at:1793;OFPST_QUEUE reply - OF1.0;ofp-print ofpt_stats_reply;
-235;ofp-print.at:1820;OFPST_QUEUE reply - OF1.1;ofp-print ofpt_stats_reply;
-236;ofp-print.at:1847;OFPST_QUEUE reply - OF1.2;ofp-print ofpt_stats_reply;
-237;ofp-print.at:1874;OFPST_QUEUE reply - OF1.3;ofp-print ofpt_stats_reply;
-238;ofp-print.at:1907;OFPST_QUEUE reply - OF1.4;ofp-print ofpt_stats_reply;
-239;ofp-print.at:1941;OFPST_GROUP request;ofp-print ofpt_stats_request;
-240;ofp-print.at:1950;OFPST_GROUP reply - OF1.1;ofp-print ofpt_stats_reply;
-241;ofp-print.at:1970;OFPST_GROUP reply - OF1.3;ofp-print ofpt_stats_reply;
-242;ofp-print.at:1992;OFPST_GROUP_DESC request - OF1.1;ofp-print ofpt_stats_request;
-243;ofp-print.at:2000;OFPST_GROUP_DESC request - OF1.5;ofp-print ofpt_stats_request;
-244;ofp-print.at:2009;OFPST_GROUP_DESC reply - OF1.1;ofp-print ofpt_stats_request;
-245;ofp-print.at:2026;OFPST_GROUP_DESC reply - OF1.5;ofp-print ofpt_stats_reply;
-246;ofp-print.at:2051;OFPST_GROUP_FEATURES request;ofp-print ofpt_stats_request;
-247;ofp-print.at:2059;OFPST_GROUP_FEATURES reply;ofp-print ofpt_stats_reply;
-248;ofp-print.at:2086;OFPST_PORT_DESC request - OF1.0;ofp-print ofpt_stats_request;
-249;ofp-print.at:2093;OFPST_PORT_DESC request - OF1.5;ofp-print ofpt_stats_request;
-250;ofp-print.at:2102;OFPST_PORT_DESC reply - OF1.0;ofp-print ofpt_stats_reply;
-251;ofp-print.at:2121;OFPST_PORT_DESC reply - OF1.4;ofp-print ofpt_stats_reply;
-252;ofp-print.at:2142;OFPT_METER_MOD request - OF1.3;ofp-print;
-253;ofp-print.at:2153;OFPT_METER_MOD request - bad band - OF1.3;ofp-print;
-254;ofp-print.at:2163;OFPT_METER_MOD request - bad command - OF1.3;ofp-print;
-255;ofp-print.at:2172;OFPT_METER_MOD request - bad flags - OF1.3;ofp-print;
-256;ofp-print.at:2182;OFPST_METER request - OF1.3;ofp-print ofpt_stats_request;
-257;ofp-print.at:2189;OFPST_METER_CONFIG request - OF1.3;ofp-print ofpt_stats_request;
-258;ofp-print.at:2196;OFPST_METER_FEATURES request - OF1.3;ofp-print ofpt_stats_request;
-259;ofp-print.at:2203;OFPST_METER_FEATURES reply - OF1.3;ofp-print ofpt_stats_reply;
-260;ofp-print.at:2216;OFPST_METER_CONFIG reply - OF1.3;ofp-print ofpt_stats_reply;
-261;ofp-print.at:2236;OFPST_METER reply - OF1.3;ofp-print ofpt_stats_reply;
-262;ofp-print.at:2260;OFPST_TABLE_FEATURES request - OF1.3;ofp-print ofpt_stats_request;
-263;ofp-print.at:2479;OFPT_BARRIER_REQUEST - OF1.0;ofp-print;
-264;ofp-print.at:2486;OFPT_BARRIER_REQUEST - OF1.1;ofp-print;
-265;ofp-print.at:2493;OFPT_BARRIER_REQUEST - OF1.2;ofp-print;
-266;ofp-print.at:2500;OFPT_BARRIER_REQUEST - OF1.3;ofp-print;
-267;ofp-print.at:2507;OFPT_BARRIER_REPLY - OF1.0;ofp-print;
-268;ofp-print.at:2514;OFPT_BARRIER_REPLY - OF1.1;ofp-print;
-269;ofp-print.at:2521;OFPT_BARRIER_REPLY - OF1.2;ofp-print;
-270;ofp-print.at:2528;OFPT_BARRIER_REPLY - OF1.3;ofp-print;
-271;ofp-print.at:2535;OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.0;ofp-print;
-272;ofp-print.at:2542;OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.2;ofp-print;
-273;ofp-print.at:2550;OFPT_QUEUE_GET_CONFIG_REPLY - OF1.0;ofp-print;
-274;ofp-print.at:2565;OFPT_QUEUE_GET_CONFIG_REPLY - OF1.2;ofp-print;
-275;ofp-print.at:2580;OFPT_SET_ASYNC - OF1.3;ofp-print;
-276;ofp-print.at:2599;OFPT_ROLE_REQUEST - OF1.2;ofp-print;
-277;ofp-print.at:2609;OFPT_ROLE_REQUEST - nochange - OF1.2;ofp-print;
-278;ofp-print.at:2619;NXT_ROLE_REQUEST;ofp-print;
-279;ofp-print.at:2629;OFPT_ROLE_REPLY - OF1.2;ofp-print;
-280;ofp-print.at:2639;NXT_ROLE_REPLY;ofp-print;
-281;ofp-print.at:2649;OFP_ROLE_STATUS - master, experimenter - OF1.4;ofp-print;
-282;ofp-print.at:2659;OFP_ROLE_STATUS - master, config - OF1.4;ofp-print;
-283;ofp-print.at:2669;OFP_ROLE_STATUS - master, config,generation - OF1.4;ofp-print;
-284;ofp-print.at:2679;NXT_SET_PACKET_IN;ofp-print;
-285;ofp-print.at:2689;NXT_PACKET_IN;ofp-print;
-286;ofp-print.at:2710;NXT_PACKET_IN, with hex output of packet data;ofp-print;
-287;ofp-print.at:2735;NXT_SET_ASYNC_CONFIG;ofp-print;
-288;ofp-print.at:2755;NXT_SET_CONTROLLER_ID;ofp-print;
-289;ofp-print.at:2765;NXT_FLOW_MONITOR_CANCEL;ofp-print;
-290;ofp-print.at:2775;NXT_FLOW_MONITOR_PAUSED;ofp-print;
-291;ofp-print.at:2784;NXT_FLOW_MONITOR_RESUMED;ofp-print;
-292;ofp-print.at:2793;NXT_SET_FLOW_FORMAT;ofp-print;
-293;ofp-print.at:2804;NXT_FLOW_MOD, low verbosity;ofp-print;
-294;ofp-print.at:2820;NXT_FLOW_MOD, high verbosity;ofp-print;
-295;ofp-print.at:2834;OFPT_GROUP_MOD - OF1.1;ofp-print;
-296;ofp-print.at:2850;OFPT_GROUP_MOD add - OF1.5;ofp-print;
-297;ofp-print.at:2871;OFPT_GROUP_MOD insert bucket - OF1.5;ofp-print;
-298;ofp-print.at:2889;NXT_FLOW_REMOVED;ofp-print;
-299;ofp-print.at:2905;NXT_FLOW_MOD_TABLE_ID;ofp-print;
-300;ofp-print.at:2915;NXST_FLOW request;ofp-print ofpt_stats_request;
-301;ofp-print.at:2925;NXST_FLOW reply;ofp-print ofpt_stats_reply;
-302;ofp-print.at:3079;NXST_AGGREGATE request;ofp-print ofpt_stats_request;
-303;ofp-print.at:3089;NXST_AGGREGATE reply;ofp-print ofpt_stats_reply;
-304;ofp-print.at:3100;NXST_FLOW_MONITOR request;ofp-print ofpt_stats_reply;
-305;ofp-print.at:3113;NXST_FLOW_MONITOR reply;ofp-print ofpt_stats_reply;
-306;ofp-print.at:3128;OFPT_BUNDLE_CONTROL - OPEN_REQUEST;ofp-print;
-307;ofp-print.at:3139;OFPT_BUNDLE_CONTROL - OPEN_REQUEST;ofp-print;
-308;ofp-print.at:3150;OFPT_BUNDLE_CONTROL - OPEN_REQUEST;ofp-print;
-309;ofp-print.at:3161;OFPT_BUNDLE_CONTROL - OPEN_REPLY;ofp-print;
-310;ofp-print.at:3172;OFPT_BUNDLE_CONTROL - CLOSE_REQUEST;ofp-print;
-311;ofp-print.at:3183;OFPT_BUNDLE_CONTROL - CLOSE_REPLY;ofp-print;
-312;ofp-print.at:3194;OFPT_BUNDLE_CONTROL - COMMIT_REQUEST;ofp-print;
-313;ofp-print.at:3205;OFPT_BUNDLE_CONTROL - COMMIT_REPLY;ofp-print;
-314;ofp-print.at:3216;OFPT_BUNDLE_CONTROL - DISCARD_REQUEST;ofp-print;
-315;ofp-print.at:3227;OFPT_BUNDLE_CONTROL - DISCARD_REPLY;ofp-print;
-316;ofp-print.at:3238;OFPT_BUNDLE_ADD_MESSAGE - verify xid;ofp-print;
-317;ofp-print.at:3248;OFPT_BUNDLE_ADD_MESSAGE - reject OFPT_HELLO;ofp-print;
-318;ofp-print.at:3258;OFPT_BUNDLE_ADD_MESSAGE - FLOW_MOD;ofp-print;
-319;ofp-print.at:3278;OFPT_BUNDLE_ADD_MESSAGE - PORT_MOD;ofp-print;
-320;ofp-util.at:3;encoding hellos;;
-321;ofp-errors.at:3;OFPT_ERROR with type OFPET_HELLO_FAILED - OF1.0;ofp-print ofp-errors;
-322;ofp-errors.at:11;OFPT_ERROR with type OFPET_HELLO_FAILED - OF1.1;ofp-print ofp-errors;
-323;ofp-errors.at:19;OFPT_ERROR with type OFPET_BAD_REQUEST - OF1.0;ofp-print ofp-errors;
-324;ofp-errors.at:29;OFPT_ERROR prints type of truncated inner messages;ofp-print ofp-errors;
-325;ofp-errors.at:46;OFPT_ERROR with code OFPBMC_BAD_PREREQ - OF1.0;ofp-print ofp-errors;
-326;ofp-errors.at:54;OFPT_ERROR with code OFPBMC_BAD_PREREQ - OF1.1;ofp-print ofp-errors;
-327;ofp-errors.at:64;OFPT_ERROR with type OFPFMFC_OVERLAP - OF1.0;ofp-print ofp-errors;
-328;ofp-errors.at:73;OFPT_ERROR with type OFPBIC_UNSUP_INST - OF1.1;ofp-print ofp-errors;
-329;ofp-errors.at:83;OFPT_ERROR with type OFPBIC_DUP_INST - OF1.4;ofp-print ofp-errors;
-330;ofp-errors.at:97;encoding OFPBIC_* experimenter errors;ofp-print ofp-errors;
-331;ofp-errors.at:117;encoding errors extension that became official;ofp-print ofp-errors;
-332;ofp-errors.at:136;decoding OFPBIC_* experimenter errors;ofp-print ofp-errors;
-333;ofp-errors.at:152;decoding experimenter errors;ofp-print ofp-errors;
-334;ofp-errors.at:184;encoding experimenter errors;ofp-print ofp-errors;
-335;ovs-ofctl.at:3;ovs-ofctl parse-flows choice of protocol;;
-336;ovs-ofctl.at:140;ovs-ofctl parse-flows (OpenFlow 1.0);;
-337;ovs-ofctl.at:177;ovs-ofctl parse-flows (OpenFlow 1.1);;
-338;ovs-ofctl.at:214;ovs-ofctl parse-flows (OpenFlow 1.2);;
-339;ovs-ofctl.at:259;ovs-ofctl parse-flow with invalid mask;;
-340;ovs-ofctl.at:298;ovs-ofctl action inconsistency (OpenFlow 1.1);;
-341;ovs-ofctl.at:304;ovs-ofctl parse-flows (With Tunnel-Parameters);;
-342;ovs-ofctl.at:316;ovs-ofctl parse-flows (skb_priority);;
-343;ovs-ofctl.at:328;ovs-ofctl parse-flows (NXM);;
-344;ovs-ofctl.at:399;ovs-ofctl -F nxm parse-flows;;
-345;ovs-ofctl.at:466;ovs-ofctl -F nxm -mmm parse-flows;;
-346;ovs-ofctl.at:531;ovs-ofctl parse-nx-match;nx-match;
-347;ovs-ofctl.at:1126;ovs-ofctl parse-ofp10-match;of1.0;
-348;ovs-ofctl.at:1341;ovs-ofctl parse-ofp11-match;of1.1;
-349;ovs-ofctl.at:1667;ovs-ofctl parse-nx-match loose;nx-match;
-350;ovs-ofctl.at:1688;ovs-ofctl parse-oxm (OpenFlow 1.2);oxm;
-351;ovs-ofctl.at:2182;ovs-ofctl parse-oxm (OpenFlow 1.3);oxm;
-352;ovs-ofctl.at:2205;ovs-ofctl parse-oxm (OpenFlow 1.5);oxm;
-353;ovs-ofctl.at:2270;ovs-ofctl parse-oxm loose;oxm;
-354;ovs-ofctl.at:2291;experimenter OXM encoding;;
-355;ovs-ofctl.at:2338;check TCP flags expression in OXM and NXM;;
-356;ovs-ofctl.at:2370;ovs-ofctl check-vlan;vlan;
-357;ovs-ofctl.at:2467;ovs-ofctl -F option and NXM features;;
-358;ovs-ofctl.at:2480;ovs-ofctl -F option with flow_mods;;
-359;ovs-ofctl.at:2492;ovs-ofctl dump-flows honors -F option;;
-360;ovs-ofctl.at:2504;ovs-ofctl dump-flows rejects bad -F option;;
-361;ovs-ofctl.at:2513;ovs-ofctl add-flow reports non-normalized flows;;
-362;ovs-ofctl.at:2527;ovs-ofctl dump-flows with sorting;sort;
-363;ovs-ofctl.at:2614;ovs-ofctl diff-flows;;
-364;ovs-ofctl.at:2646;ovs-ofctl diff-flows - suppress false differences;;
-365;ovs-ofctl.at:2663;ovs-ofctl -F and -O interaction;;
-366;ovs-ofctl.at:2684;ovs-ofctl ofp-parse;;
-367;ovs-ofctl.at:2702;tcp flags - filtering;;
-368;ovs-ofctl.at:2771;ovs-ofctl rule with importance;;
-369;ovs-ofctl.at:2798;ovs-ofctl replace-flows with importance;;
-370;ovs-ofctl.at:2817;ovs-ofctl replace-flows with --bundle;;
-371;odp.at:3;OVS datapath key parsing and formatting - valid forms;;
-372;odp.at:93;OVS datapath wildcarded key parsing and formatting - valid forms;;
-373;odp.at:167;OVS datapath wildcarded key filtering.;;
-374;odp.at:232;OVS datapath actions parsing and formatting - valid forms;;
-375;mpls-xlate.at:3;MPLS xlate action;;
-376;multipath.at:10;modulo_n multipath link selection;;
-377;multipath.at:78;hash_threshold multipath link selection;;
-378;multipath.at:146;hrw multipath link selection;;
-379;multipath.at:214;iter_hash multipath link selection;;
-380;multipath.at:282;multipath action missing argument;;
-381;multipath.at:288;multipath action bad fields;;
-382;multipath.at:294;multipath action bad algorithm;;
-383;multipath.at:300;multipath action bad n_links;;
-384;multipath.at:306;multipath action destination too narrow;;
-385;learn.at:3;learning action - parsing and formatting;;
-386;learn.at:24;learning action - parsing and formatting - illegal in_port_oxm;;
-387;learn.at:33;learning action - parsing and formatting - OXM;;
-388;learn.at:46;learning action - examples;;
-389;learn.at:64;learning action - satisfied prerequisites;;
-390;learn.at:79;learning action - invalid prerequisites;;
-391;learn.at:94;learning action - too-long immediate value;;
-392;learn.at:108;learning action - standard VLAN+MAC learning;;
-393;learn.at:177;learning action - learn refreshes hard_age;;
-394;learn.at:245;learning action - TCPv4 port learning;;
-395;learn.at:271;learning action - TCPv6 port learning;;
-396;learn.at:303;learning action - self-modifying flow;;
-397;learn.at:345;learning action - self-modifying flow with idle_timeout;;
-398;learn.at:403;learning action - self-modifying flow with hard_timeout;;
-399;learn.at:487;learning action - fin_timeout feature;;
-400;learn.at:502;learning action - delete_learned feature;;
-401;vconn.at:21;unix vconn - refuse connection;;
-402;vconn.at:21;unix vconn - accept then close;;
-403;vconn.at:21;unix vconn - read hello;;
-404;vconn.at:21;unix vconn - send plain hello;;
-405;vconn.at:21;unix vconn - send long hello;;
-406;vconn.at:21;unix vconn - send echo hello;;
-407;vconn.at:21;unix vconn - send short hello;;
-408;vconn.at:21;unix vconn - send invalid version hello;;
-409;vconn.at:22;tcp vconn - refuse connection;;
-410;vconn.at:22;tcp vconn - accept then close;;
-411;vconn.at:22;tcp vconn - read hello;;
-412;vconn.at:22;tcp vconn - send plain hello;;
-413;vconn.at:22;tcp vconn - send long hello;;
-414;vconn.at:22;tcp vconn - send echo hello;;
-415;vconn.at:22;tcp vconn - send short hello;;
-416;vconn.at:22;tcp vconn - send invalid version hello;;
-417;vconn.at:23;ssl vconn - refuse connection;;
-418;vconn.at:23;ssl vconn - accept then close;;
-419;vconn.at:23;ssl vconn - read hello;;
-420;vconn.at:23;ssl vconn - send plain hello;;
-421;vconn.at:23;ssl vconn - send long hello;;
-422;vconn.at:23;ssl vconn - send echo hello;;
-423;vconn.at:23;ssl vconn - send short hello;;
-424;vconn.at:23;ssl vconn - send invalid version hello;;
-425;file_name.at:13;components of \"/usr/lib\" are \"/usr\", \"lib\";dir_name base_name;
-426;file_name.at:14;components of \"/usr/\" are \"/\", \"usr\";dir_name base_name;
-427;file_name.at:15;components of \"usr\" are \".\", \"usr\";dir_name base_name;
-428;file_name.at:16;components of \"/\" are \"/\", \"/\";dir_name base_name;
-429;file_name.at:17;components of \".\" are \".\", \".\";dir_name base_name;
-430;file_name.at:18;components of \"..\" are \".\", \"..\";dir_name base_name;
-431;file_name.at:19;components of \"//\" are \"//\", \"//\";dir_name base_name;
-432;file_name.at:20;components of \"//foo\" are \"//\", \"foo\";dir_name base_name;
-433;file_name.at:21;components of \"\" are \".\", \".\";dir_name base_name;
-434;file_name.at:24;components of \"dir/file\" are \"dir\", \"file\";dir_name base_name;
-435;file_name.at:25;components of \"dir/file/\" are \"dir\", \"file\";dir_name base_name;
-436;file_name.at:26;components of \"dir/file//\" are \"dir\", \"file\";dir_name base_name;
-437;file_name.at:27;components of \"///foo\" are \"/\", \"foo\";dir_name base_name;
-438;file_name.at:37;follow_symlinks - relative symlinks;;
-439;file_name.at:54;follow_symlinks - absolute symlinks;;
-440;file_name.at:71;follow_symlinks - symlinks to directories;;
-441;file_name.at:84;follow_symlinks - nonexistent targets;;
-442;file_name.at:92;follow_symlinks - regular files;;
-443;file_name.at:97;follow_symlinks - device targets;;
-444;file_name.at:106;follow_symlinks - nonexistent files;;
-445;file_name.at:114;follow_symlinks - symlink loop;;
-446;aes128.at:10;wikipedia test vector 1;aes128;
-447;aes128.at:16;wikipedia test vector 2;aes128;
-448;aes128.at:22;NIST KAT ECBKeySbox128e vector 0;aes128;
-449;aes128.at:28;NIST KAT ECBKeySbox128e vector 1;aes128;
-450;aes128.at:34;NIST KAT ECBKeySbox128e vector 2;aes128;
-451;aes128.at:40;NIST KAT ECBKeySbox128e vector 3;aes128;
-452;aes128.at:46;NIST KAT ECBKeySbox128e vector 4;aes128;
-453;aes128.at:52;NIST KAT ECBKeySbox128e vector 5;aes128;
-454;aes128.at:58;NIST KAT ECBKeySbox128e vector 6;aes128;
-455;aes128.at:64;NIST KAT ECBKeySbox128e vector 7;aes128;
-456;aes128.at:70;NIST KAT ECBKeySbox128e vector 8;aes128;
-457;aes128.at:76;NIST KAT ECBKeySbox128e vector 9;aes128;
-458;aes128.at:82;NIST KAT ECBKeySbox128e vector 10;aes128;
-459;aes128.at:88;NIST KAT ECBKeySbox128e vector 11;aes128;
-460;aes128.at:94;NIST KAT ECBKeySbox128e vector 12;aes128;
-461;aes128.at:100;NIST KAT ECBKeySbox128e vector 13;aes128;
-462;aes128.at:106;NIST KAT ECBKeySbox128e vector 14;aes128;
-463;aes128.at:112;NIST KAT ECBKeySbox128e vector 15;aes128;
-464;aes128.at:118;NIST KAT ECBKeySbox128e vector 16;aes128;
-465;aes128.at:124;NIST KAT ECBKeySbox128e vector 17;aes128;
-466;aes128.at:130;NIST KAT ECBKeySbox128e vector 18;aes128;
-467;aes128.at:136;NIST KAT ECBKeySbox128e vector 19;aes128;
-468;aes128.at:142;NIST KAT ECBKeySbox128e vector 20;aes128;
-469;unixctl-py.at:6;unixctl ovs-vswitchd exit - Python;;
-470;unixctl-py.at:17;unixctl ovs-vswitchd list-commands - Python;;
-471;unixctl-py.at:32;unixctl ovs-vswitchd arguments - Python;;
-472;unixctl-py.at:74;unixctl bad target - Python;;
-473;unixctl-py.at:91;unixctl server - Python;;
-474;unixctl-py.at:165;unixctl server errors - Python;;
-475;uuid.at:15;UUID generation, parsing, serialization;uuid;
-476;json.at:65;empty array - C;json positive;
-477;json.at:65;empty array - Python;json positive python;
-478;json.at:66;single-element array - C;json positive;
-479;json.at:66;single-element array - Python;json positive python;
-480;json.at:67;2-element array - C;json positive;
-481;json.at:67;2-element array - Python;json positive python;
-482;json.at:68;many-element array - C;json positive;
-483;json.at:68;many-element array - Python;json positive python;
-484;json.at:71;missing comma - C;json negative;
-485;json.at:71;missing comma - Python;json negative python;
-486;json.at:73;trailing comma not allowed - C;json negative;
-487;json.at:73;trailing comma not allowed - Python;json negative python;
-488;json.at:75;doubled comma not allowed - C;json negative;
-489;json.at:75;doubled comma not allowed - Python;json negative python;
-490;json.at:80;empty string - C;json positive;
-491;json.at:80;empty string - Python;json positive python;
-492;json.at:81;1-character strings - C;json positive;
-493;json.at:81;1-character strings - Python;json positive python;
-494;json.at:84;escape sequences - C;json positive;
-495;json.at:84;escape sequences - Python;json positive python;
-496;json.at:87;Unicode escape sequences - C;json positive;
-497;json.at:87;Unicode escape sequences - Python;json positive python;
-498;json.at:90;surrogate pairs - C;json positive;
-499;json.at:93;surrogate pairs - Python;json positive python;
-500;json.at:96;a string by itself is not valid JSON - C;json negative;
-501;json.at:96;a string by itself is not valid JSON - Python;json negative python;
-502;json.at:98;end of line in quoted string - C;json negative;
-503;json.at:98;end of line in quoted string - Python;json negative python;
-504;json.at:102;formfeed in quoted string - C;json negative;
-505;json.at:102;formfeed in quoted string - Python;json negative python;
-506;json.at:105;bad escape in quoted string - C;json negative;
-507;json.at:105;bad escape in quoted string - Python;json negative python;
-508;json.at:108;\\u must be followed by 4 hex digits (1) - C;json negative;
-509;json.at:108;\\u must be followed by 4 hex digits (1) - Python;json negative python;
-510;json.at:111;\\u must be followed by 4 hex digits (2) - C;json negative;
-511;json.at:111;\\u must be followed by 4 hex digits (2) - Python;json negative python;
-512;json.at:114;isolated leading surrogate not allowed - C;json negative;
-513;json.at:114;isolated leading surrogate not allowed - Python;json negative python;
-514;json.at:117;surrogatess must paired properly - C;json negative;
-515;json.at:117;surrogatess must paired properly - Python;json negative python;
-516;json.at:120;null bytes not allowed - C;json negative;
-517;json.at:120;null bytes not allowed - Python;json negative python;
-518;json.at:124;properly quoted backslash at end of string - C;json positive;
-519;json.at:124;properly quoted backslash at end of string - Python;json positive python;
-520;json.at:127;stray backslash at end of string - C;json negative;
-521;json.at:127;stray backslash at end of string - Python;json negative python;
-522;json.at:131;end of input in quoted string - C;json negative;
-523;json.at:138;end of input in quoted string - Python;json negative python;
-524;json.at:149;empty object - C;json positive;
-525;json.at:149;empty object - Python;json positive python;
-526;json.at:150;simple object - C;json positive;
-527;json.at:150;simple object - Python;json positive python;
-528;json.at:153;bad value - C;json negative;
-529;json.at:153;bad value - Python;json negative python;
-530;json.at:155;missing colon - C;json negative;
-531;json.at:155;missing colon - Python;json negative python;
-532;json.at:157;missing comma - C;json negative;
-533;json.at:157;missing comma - Python;json negative python;
-534;json.at:159;trailing comma not allowed - C;json negative;
-535;json.at:159;trailing comma not allowed - Python;json negative python;
-536;json.at:162;doubled comma not allowed - C;json negative;
-537;json.at:162;doubled comma not allowed - Python;json negative python;
-538;json.at:165;names must be strings - C;json negative;
-539;json.at:165;names must be strings - Python;json negative python;
-540;json.at:171;null - C;json positive;
-541;json.at:171;null - Python;json positive python;
-542;json.at:172;false - C;json positive;
-543;json.at:172;false - Python;json positive python;
-544;json.at:173;true - C;json positive;
-545;json.at:173;true - Python;json positive python;
-546;json.at:174;a literal by itself is not valid JSON - C;json negative;
-547;json.at:174;a literal by itself is not valid JSON - Python;json negative python;
-548;json.at:176;nullify is invalid - C;json negative;
-549;json.at:176;nullify is invalid - Python;json negative python;
-550;json.at:178;nubs is invalid - C;json negative;
-551;json.at:178;nubs is invalid - Python;json negative python;
-552;json.at:180;xxx is invalid - C;json negative;
-553;json.at:180;xxx is invalid - Python;json negative python;
-554;json.at:185;integers expressed as reals - C;json positive;
-555;json.at:185;integers expressed as reals - Python;json positive python;
-556;json.at:195;large integers - C;json positive;
-557;json.at:195;large integers - Python;json positive python;
-558;json.at:199;large integers expressed as reals - C;json positive;
-559;json.at:199;large integers expressed as reals - Python;json positive python;
-560;json.at:207;large integers that overflow to reals - C;json positive;
-561;json.at:207;large integers that overflow to reals - Python;json positive python;
-562;json.at:212;negative zero - C;json positive;
-563;json.at:212;negative zero - Python;json positive python;
-564;json.at:217;reals - C;json positive;
-565;json.at:217;reals - Python;json positive python;
-566;json.at:221;scientific notation - C;json positive;
-567;json.at:221;scientific notation - Python;json positive python;
-568;json.at:228;+/- DBL_MAX - C;json positive;
-569;json.at:228;+/- DBL_MAX - Python;json positive python;
-570;json.at:233;negative reals - C;json positive;
-571;json.at:233;negative reals - Python;json positive python;
-572;json.at:237;negative scientific notation - C;json positive;
-573;json.at:237;negative scientific notation - Python;json positive python;
-574;json.at:241;1e-9999 underflows to 0 - C;json positive;
-575;json.at:241;1e-9999 underflows to 0 - Python;json positive python;
-576;json.at:245;a number by itself is not valid JSON - C;json negative;
-577;json.at:245;a number by itself is not valid JSON - Python;json negative python;
-578;json.at:247;leading zeros not allowed - C;json negative;
-579;json.at:247;leading zeros not allowed - Python;json negative python;
-580;json.at:251;1e9999 is too big - C;json negative;
-581;json.at:251;1e9999 is too big - Python;json negative python;
-582;json.at:255;exponent bigger than INT_MAX - C;json negative;
-583;json.at:255;exponent bigger than INT_MAX - Python;json negative python;
-584;json.at:259;decimal point must be followed by digit - C;json negative;
-585;json.at:259;decimal point must be followed by digit - Python;json negative python;
-586;json.at:263;exponent must contain at least one digit (1) - C;json negative;
-587;json.at:263;exponent must contain at least one digit (1) - Python;json negative python;
-588;json.at:267;exponent must contain at least one digit (2) - C;json negative;
-589;json.at:267;exponent must contain at least one digit (2) - Python;json negative python;
-590;json.at:271;exponent must contain at least one digit (3) - C;json negative;
-591;json.at:271;exponent must contain at least one digit (3) - Python;json negative python;
-592;json.at:278;RFC 4267 object example - C;json positive;
-593;json.at:278;RFC 4267 object example - Python;json positive python;
-594;json.at:294;RFC 4267 array example - C;json positive;
-595;json.at:294;RFC 4267 array example - Python;json positive python;
-596;json.at:321;trailing garbage - C;json negative;
-597;json.at:321;trailing garbage - Python;json negative python;
-598;json.at:323;formfeeds are not valid white space - C;json negative;
-599;json.at:323;formfeeds are not valid white space - Python;json negative python;
-600;json.at:325;';' is not a valid token - C;json negative;
-601;json.at:325;';' is not a valid token - Python;json negative python;
-602;json.at:327;arrays nesting too deep - C;json negative;
-603;json.at:327;arrays nesting too deep - Python;json negative python;
-604;json.at:331;objects nesting too deep - C;json negative;
-605;json.at:331;objects nesting too deep - Python;json negative python;
-606;json.at:336;input may not be empty;json negative;
-607;json.at:344;multiple adjacent objects - C;json positive;
-608;json.at:344;multiple adjacent objects - Python;json positive python;
-609;json.at:349;multiple space-separated objects - C;json positive;
-610;json.at:349;multiple space-separated objects - Python;json positive python;
-611;json.at:354;multiple objects on separate lines - C;json positive;
-612;json.at:354;multiple objects on separate lines - Python;json positive python;
-613;json.at:361;multiple objects and arrays - C;json positive;
-614;json.at:361;multiple objects and arrays - Python;json positive python;
-615;json.at:367;garbage between multiple objects - C;json negative;
-616;json.at:367;garbage between multiple objects - Python;json negative python;
-617;json.at:371;garbage after multiple objects - C;json negative;
-618;json.at:371;garbage after multiple objects - Python;json negative python;
-619;jsonrpc.at:3;JSON-RPC request and successful reply;;
-620;jsonrpc.at:15;JSON-RPC request and error reply;;
-621;jsonrpc.at:27;JSON-RPC notification;;
-622;jsonrpc-py.at:3;JSON-RPC request and successful reply - Python;;
-623;jsonrpc-py.at:16;JSON-RPC request and error reply - Python;;
-624;jsonrpc-py.at:29;JSON-RPC notification - Python;;
-625;tunnel.at:3;tunnel - input;;
-626;tunnel.at:65;tunnel - ECN decapsulation;;
-627;tunnel.at:112;tunnel - output;;
-628;tunnel.at:145;tunnel - ToS and TTL inheritance;;
-629;tunnel.at:184;tunnel - set_tunnel;;
-630;tunnel.at:219;tunnel - key;;
-631;tunnel.at:269;tunnel - key match;;
-632;tunnel.at:319;tunnel - Geneve;;
-633;tunnel.at:331;tunnel - VXLAN;;
-634;tunnel.at:343;tunnel - LISP;;
-635;tunnel.at:355;tunnel - different VXLAN UDP port;;
-636;tunnel.at:384;ofproto-dpif - set_field - tun_src/tun_dst/tun_id;;
-637;tunnel-push-pop.at:3;tunnel_push_pop - action;;
-638;lockfile.at:15;lock and unlock;lockfile;
-639;lockfile.at:17;lock and unlock twice;lockfile;
-640;lockfile.at:19;lock blocks same process;lockfile;
-641;lockfile.at:23;lock blocks same process twice;lockfile;
-642;lockfile.at:28;lock blocks other process;lockfile;
-643;lockfile.at:33;lock twice blocks other process;lockfile;
-644;lockfile.at:39;lock and unlock allows other process;lockfile;
-645;lockfile.at:41;lock multiple;lockfile;
-646;lockfile.at:45;lock symlink;lockfile;
-647;lockfile.at:52;lock symlink to dir;lockfile;
-648;reconnect.at:26;nothing happens if not enabled - C;reconnect;
-649;reconnect.at:26;nothing happens if not enabled - Python;reconnect;
-650;reconnect.at:37;quick connect, idle disconnect - C;reconnect;
-651;reconnect.at:37;quick connect, idle disconnect - Python;reconnect;
-652;reconnect.at:93;slow connect, idle disconnect - C;reconnect;
-653;reconnect.at:93;slow connect, idle disconnect - Python;reconnect;
-654;reconnect.at:163;connect backs off - C;reconnect;
-655;reconnect.at:163;connect backs off - Python;reconnect;
-656;reconnect.at:362;connections with no data preserve backoff - C;reconnect;
-657;reconnect.at:362;connections with no data preserve backoff - Python;reconnect;
-658;reconnect.at:526;brief connection preserves backoff - C;reconnect;
-659;reconnect.at:526;brief connection preserves backoff - Python;reconnect;
-660;reconnect.at:657;brief connection with data preserves backoff - C;reconnect;
-661;reconnect.at:657;brief connection with data preserves backoff - Python;reconnect;
-662;reconnect.at:818;long connection resets backoff - C;reconnect;
-663;reconnect.at:818;long connection resets backoff - Python;reconnect;
-664;reconnect.at:979;connection attempt fails quickly - C;reconnect;
-665;reconnect.at:979;connection attempt fails quickly - Python;reconnect;
-666;reconnect.at:1034;max-tries of 1 honored - C;reconnect;
-667;reconnect.at:1034;max-tries of 1 honored - Python;reconnect;
-668;reconnect.at:1094;max-tries of 0 honored - C;reconnect;
-669;reconnect.at:1094;max-tries of 0 honored - Python;reconnect;
-670;reconnect.at:1110;passive mode - C;reconnect;
-671;reconnect.at:1110;passive mode - Python;reconnect;
-672;ovs-vswitchd.at:7;ovs-vswitchd detaches correctly with empty db;;
-673;ovs-vswitchd.at:38;ovs-vswitchd -- stats-update-interval;;
-674;ovs-vswitchd.at:71;ovs-vswitchd -- start additional ovs-vswitchd process;;
-675;ovs-vswitchd.at:95;ovs-vswitchd -- switch over to another ovs-vswitchd process;;
-676;ovs-vswitchd.at:134;ovs-vswitchd -- invalid database path;;
-677;ofproto.at:3;ofproto - echo request;;
-678;ofproto.at:9;ofproto - handling messages with bad version;;
-679;ofproto.at:32;ofproto - feature request, config request;;
-680;ofproto.at:49;ofproto - set OpenFlow port number;;
-681;ofproto.at:82;ofproto - port stats - (OpenFlow 1.0);;
-682;ofproto.at:93;ofproto - port stats - (OpenFlow 1.2);;
-683;ofproto.at:104;ofproto - port stats - (OpenFlow 1.4);;
-684;ofproto.at:119;ofproto - port-desc stats (OpenFlow 1.0);;
-685;ofproto.at:134;ofproto - port-desc stats (OpenFlow 1.2);;
-686;ofproto.at:147;ofproto - port-desc stats (OpenFlow 1.5);;
-687;ofproto.at:183;ofproto - queue stats - (OpenFlow 1.0);;
-688;ofproto.at:200;ofproto - queue stats - (OpenFlow 1.2);;
-689;ofproto.at:217;ofproto - queue stats - (OpenFlow 1.4);;
-690;ofproto.at:236;ofproto - queue configuration - (OpenFlow 1.0);;
-691;ofproto.at:250;ofproto - queue configuration - (OpenFlow 1.2);;
-692;ofproto.at:267;ofproto - no group support (OpenFlow 1.0);;
-693;ofproto.at:286;ofproto - del group (OpenFlow 1.1);;
-694;ofproto.at:327;ofproto - add indirect group;;
-695;ofproto.at:343;ofproto - del group (OpenFlow 1.5);;
-696;ofproto.at:377;ofproto - del group deletes flows;;
-697;ofproto.at:418;ofproto - insert buckets;;
-698;ofproto.at:476;ofproto - remove buckets;;
-699;ofproto.at:532;ofproto - flow mod checks group availability;;
-700;ofproto.at:560;ofproto - group description;;
-701;ofproto.at:573;ofproto - group description;;
-702;ofproto.at:586;ofproto - group features;;
-703;ofproto.at:612;ofproto - group stats (OpenFlow 1.1);;
-704;ofproto.at:636;ofproto - group stats (OpenFlow 1.3);;
-705;ofproto.at:660;ofproto - group stats (OpenFlow 1.5);;
-706;ofproto.at:684;ofproto - group add then bridge delete (OpenFlow 1.3);;
-707;ofproto.at:695;ofproto - mod-port (OpenFlow 1.0);;
-708;ofproto.at:729;ofproto - mod-port (OpenFlow 1.2);;
-709;ofproto.at:760;ofproto - mod-port (OpenFlow 1.4);;
-710;ofproto.at:792;ofproto - basic flow_mod commands (NXM);;
-711;ofproto.at:814;ofproto - basic flow_mod commands (OpenFlow 1.0);;
-712;ofproto.at:836;ofproto - basic flow_mod commands (OpenFlow 1.1);;
-713;ofproto.at:859;ofproto - flow_mod negative test (OpenFlow 1.1);;
-714;ofproto.at:873;ofproto - set-field flow_mod commands (NXM);;
-715;ofproto.at:886;ofproto - basic flow_mod commands (OpenFlow 1.2);;
-716;ofproto.at:905;ofproto - set-field flow_mod commands (OF1.2);;
-717;ofproto.at:918;ofproto - dump flows with cookie;;
-718;ofproto.at:942;ofproto - mod flow with cookie change (OpenFlow 1.0);;
-719;ofproto.at:958;ofproto - mod flow with cookie change (NXM);;
-720;ofproto.at:974;ofproto - no mod flow with cookie change (OpenFlow 1.1);;
-721;ofproto.at:990;ofproto - no mod flow with cookie change (OpenFlow 1.2);;
-722;ofproto.at:1006;ofproto - mod flows based on cookie mask (OpenFlow 1.0);;
-723;ofproto.at:1028;ofproto - mod flows based on cookie mask (OpenFlow 1.1);;
-724;ofproto.at:1050;ofproto - mod flows based on cookie mask (OpenFlow 1.2);;
-725;ofproto.at:1073;ofproto - mod flows based on cookie mask with cookie change;;
-726;ofproto.at:1095;ofproto - mod flow with cookie miss (mask==0) - NXM;;
-727;ofproto.at:1105;ofproto - mod flow with cookie miss (mask==0) - OF1.1;;
-728;ofproto.at:1115;ofproto - mod flow with cookie miss (mask==0) - OF1.2;;
-729;ofproto.at:1124;ofproto - mod flow with cookie miss (mask!=0) - NXM;;
-730;ofproto.at:1133;ofproto - mod flow with cookie miss (mask!=0) - OF1.1;;
-731;ofproto.at:1142;ofproto - mod flow with cookie miss (mask!=0) - OF1.2;;
-732;ofproto.at:1151;ofproto - del flows with cookies;;
-733;ofproto.at:1170;ofproto - del flows based on cookie;;
-734;ofproto.at:1191;ofproto - del flows based on cookie mask;;
-735;ofproto.at:1210;ofproto - del flows based on table id (NXM);;
-736;ofproto.at:1242;ofproto - del flows based on table id (OpenFlow 1.1);;
-737;ofproto.at:1275;ofproto - del flows based on table id (OpenFlow 1.2);;
-738;ofproto.at:1307;ofproto - flow table configuration (OpenFlow 1.0);;
-739;ofproto.at:1357;ofproto - hidden rules not in table stats;;
-740;ofproto.at:1406;ofproto - flow table configuration (OpenFlow 1.2);;
-741;ofproto.at:1487;ofproto - table features (OpenFlow 1.3);;
-742;ofproto.at:1603;ofproto - hard limits on flow table size (OpenFlow 1.0);;
-743;ofproto.at:1647;ofproto - hard limits on flow table size (OpenFlow 1.2);;
-744;ofproto.at:1686;ofproto - eviction upon table overflow (OpenFlow 1.0);;
-745;ofproto.at:1744;ofproto - eviction upon table overflow (OpenFlow 1.2);;
-746;ofproto.at:1803;ofproto - eviction upon table overflow, with fairness (OpenFlow 1.0);;
-747;ofproto.at:1885;ofproto - eviction upon table overflow, with fairness (OpenFlow 1.2);;
-748;ofproto.at:1967;ofproto - eviction upon table overflow, with modified hard timeout;;
-749;ofproto.at:2011;ofproto - eviction upon table overflow, with modified idle timeout;;
-750;ofproto.at:2055;ofproto - asynchronous message control (OpenFlow 1.0);;
-751;ofproto.at:2158;ofproto - asynchronous message control (OpenFlow 1.2);;
-752;ofproto.at:2262;ofproto - asynchronous message control (OpenFlow 1.3);;
-753;ofproto.at:2371;ofproto - asynchronous message control (OpenFlow 1.5);;
-754;ofproto.at:2446;ofproto - controller role (OpenFlow 1.2);;
-755;ofproto.at:2511;ofproto - controller role (OpenFlow 1.4);;
-756;ofproto.at:2577;ofproto - packet-out from controller (OpenFlow 1.0);;
-757;ofproto.at:2613;ofproto - packet-out from controller (OpenFlow 1.2);;
-758;ofproto.at:2646;ofproto - packet-out from controller (OpenFlow 1.1);;
-759;ofproto.at:2677;ofproto - packet-out with metadata (NXM);;
-760;ofproto.at:2705;ofproto - packet-out with metadata (OpenFlow 1.2);;
-761;ofproto.at:2733;ofproto - packet-out with metadata and dual set_field (OpenFlow 1.3);;
-762;ofproto.at:2760;ofproto - packet-out with tunnel metadata (OpenFlow 1.2);;
-763;ofproto.at:2808;ofproto - flow monitoring;monitor;
-764;ofproto.at:2945;ofproto - flow monitoring with !own;monitor;
-765;ofproto.at:2986;ofproto - flow monitoring with out_port;monitor;
-766;ofproto.at:3038;ofproto - flow monitoring pause and resume;monitor;
-767;ofproto.at:3144;ofproto - event filtering (OpenFlow 1.3);monitor;
-768;ofproto.at:3178;ofproto - ofport_request;;
-769;ofproto.at:3234;ofproto - bundles, open (OpenFlow 1.4);monitor;
-770;ofproto.at:3258;ofproto - bundles, double open (OpenFlow 1.4);monitor;
-771;ofproto.at:3290;ofproto - bundle close without open (OpenFlow 1.4);monitor;
-772;ofproto.at:3314;ofproto - bundle double close (OpenFlow 1.4);monitor;
-773;ofproto.at:3353;ofproto - bundle close, different flags (OpenFlow 1.4);monitor;
-774;ofproto.at:3385;ofproto - bundle commit without open (OpenFlow 1.4);monitor;
-775;ofproto.at:3410;ofproto - bundle commit, different flags (OpenFlow 1.4);monitor;
-776;ofproto.at:3442;ofproto - bundle discard without open (OpenFlow 1.4);monitor;
-777;ofproto.at:3468;ofproto - bundle with multiple flow mods (OpenFlow 1.4);monitor;
-778;ofproto.at:3659;ofproto - failing bundle commit (OpenFlow 1.4);monitor;
-779;dpif-netdev.at:23;dpif-netdev - dummy interface;;
-780;dpif-netdev.at:57;dpif-netdev - miss upcall key matches flow_install;;
-781;dpif-netdev.at:92;dpif-netdev - miss upcall key matches flow_dump;;
-782;dpctl.at:3;dpctl - add-dp del-dp;;
-783;dpctl.at:19;dpctl - add-if set-if del-if;;
-784;ofproto-dpif.at:3;ofproto-dpif - revalidator/wait;;
-785;ofproto-dpif.at:9;ofproto-dpif - active-backup bonding;;
-786;ofproto-dpif.at:56;ofproto-dpif - balance-slb bonding;;
-787;ofproto-dpif.at:99;ofproto-dpif - balance-tcp bonding;;
-788;ofproto-dpif.at:152;ofproto-dpif - balance-tcp bonding, different recirc flow ;;
-789;ofproto-dpif.at:211;ofproto-dpif - resubmit;;
-790;ofproto-dpif.at:231;ofproto-dpif - goto table;;
-791;ofproto-dpif.at:245;ofproto-dpif - write actions;;
-792;ofproto-dpif.at:262;ofproto-dpif - modify IPv6 Neighbor Solitication (ND);;
-793;ofproto-dpif.at:281;ofproto-dpif - clear actions;;
-794;ofproto-dpif.at:297;ofproto-dpif - group chaining not supported;;
-795;ofproto-dpif.at:308;ofproto-dpif - all group in action list;;
-796;ofproto-dpif.at:323;ofproto-dpif - indirect group in action list;;
-797;ofproto-dpif.at:335;ofproto-dpif - group actions have no effect afterwards;;
-798;ofproto-dpif.at:347;ofproto-dpif - all group in action set;;
-799;ofproto-dpif.at:362;ofproto-dpif - indirect group in action set;;
-800;ofproto-dpif.at:374;ofproto-dpif - select group;;
-801;ofproto-dpif.at:394;ofproto-dpif - select group with watch port;;
-802;ofproto-dpif.at:406;ofproto-dpif - select group with weight;;
-803;ofproto-dpif.at:418;ofproto-dpif - select group with hash selection method;;
-804;ofproto-dpif.at:451;ofproto-dpif - fast failover group;;
-805;ofproto-dpif.at:463;ofproto-dpif - group stats single bucket;;
-806;ofproto-dpif.at:484;ofproto-dpif - group stats all buckets;;
-807;ofproto-dpif.at:505;ofproto-dpif - registers;;
-808;ofproto-dpif.at:542;ofproto-dpif - extended registers;;
-809;ofproto-dpif.at:561;ofproto-dpif - load and move order;;
-810;ofproto-dpif.at:575;ofproto-dpif - copy-field into extended registers;;
-811;ofproto-dpif.at:595;ofproto-dpif - masked set-field into metadata;;
-812;ofproto-dpif.at:617;ofproto-dpif - actset_output;;
-813;ofproto-dpif.at:657;ofproto-dpif - push-pop;;
-814;ofproto-dpif.at:676;ofproto-dpif - output;;
-815;ofproto-dpif.at:697;ofproto-dpif - dec_ttl;;
-816;ofproto-dpif.at:741;ofproto-dpif - dec_ttl without arguments at offset 32 in ofpacts;;
-817;ofproto-dpif.at:758;ofproto-dpif - dec_ttl with arguments at offset 32 in ofpacts;;
-818;ofproto-dpif.at:775;ofproto-dpif - note at offset 24 in ofpacts;;
-819;ofproto-dpif.at:785;ofproto-dpif - output, OFPP_NONE ingress port;;
-820;ofproto-dpif.at:803;ofproto-dpif - DSCP;;
-821;ofproto-dpif.at:830;ofproto-dpif - output/flood flags;;
-822;ofproto-dpif.at:888;ofproto-dpif - Default Table Miss - OF1.0 (OFPTC_TABLE_MISS_CONTROLLER);;
-823;ofproto-dpif.at:922;ofproto-dpif - Default Table Miss - OF1.3 (OFPTC_TABLE_MISS_DROP);;
-824;ofproto-dpif.at:950;ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_CONTROLLER;;
-825;ofproto-dpif.at:986;ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_CONTROLLER;;
-826;ofproto-dpif.at:1014;ofproto-dpif - Table Miss - OFPTC_TABLE_MISS_CONTINUE;;
-827;ofproto-dpif.at:1073;ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_CONTINUE;;
-828;ofproto-dpif.at:1137;ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_CONTINUE;;
-829;ofproto-dpif.at:1183;ofproto-dpif - Table Miss - OFPTC_TABLE_MISS_DROP;;
-830;ofproto-dpif.at:1211;ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_DROP;;
-831;ofproto-dpif.at:1242;ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_DROP;;
-832;ofproto-dpif.at:1273;ofproto-dpif - controller;;
-833;ofproto-dpif.at:1543;ofproto-dpif - MPLS handling;;
-834;ofproto-dpif.at:2593;ofproto-dpif - MPLS handling with goto_table;;
-835;ofproto-dpif.at:2641;ofproto-dpif - MPLS handling with write_actions;;
-836;ofproto-dpif.at:2689;ofproto-dpif - table-miss flow (OpenFlow 1.0);;
-837;ofproto-dpif.at:2729;ofproto-dpif - table-miss flow (OpenFlow 1.3);;
-838;ofproto-dpif.at:2770;ofproto-dpif - table-miss flow with async config (OpenFlow 1.3);;
-839;ofproto-dpif.at:2838;ofproto-dpif - table-miss flow (OpenFlow 1.4);;
-840;ofproto-dpif.at:2880;ofproto-dpif - packet-in reasons (Openflow 1.3);;
-841;ofproto-dpif.at:2948;ofproto-dpif - packet-in reasons (Openflow 1.4);;
-842;ofproto-dpif.at:3016;ofproto-dpif - ARP modification slow-path;;
-843;ofproto-dpif.at:3045;ofproto-dpif - VLAN handling;;
-844;ofproto-dpif.at:3179;ofproto-dpif - MPLS handling;;
-845;ofproto-dpif.at:3296;ofproto-dpif - VLAN+MPLS handling;;
-846;ofproto-dpif.at:3687;ofproto-dpif - fragment handling - trace;;
-847;ofproto-dpif.at:3736;ofproto-dpif - fragment handling - upcall;;
-848;ofproto-dpif.at:3811;ofproto-dpif - fragment handling - actions;;
-849;ofproto-dpif.at:3913;ofproto-dpif - exit;;
-850;ofproto-dpif.at:3938;ofproto-dpif - mirroring, select_all;;
-851;ofproto-dpif.at:3968;ofproto-dpif - mirroring, select_src;;
-852;ofproto-dpif.at:3996;ofproto-dpif - mirroring, OFPP_NONE ingress port;;
-853;ofproto-dpif.at:4017;ofproto-dpif - mirroring, select_dst;;
-854;ofproto-dpif.at:4047;ofproto-dpif - mirroring, select_vlan;;
-855;ofproto-dpif.at:4082;ofproto-dpif - mirroring, output_port;;
-856;ofproto-dpif.at:4111;ofproto-dpif - mirroring, output_vlan;;
-857;ofproto-dpif.at:4149;ofproto-dpif - ofproto/trace command 1;;
-858;ofproto-dpif.at:4290;ofproto-dpif - ofproto/trace command 2;;
-859;ofproto-dpif.at:4407;ofproto-dpif - ofproto/trace from dpctl output;;
-860;ofproto-dpif.at:4454;ofproto-dpif - ofproto/trace-packet-out;;
-861;ofproto-dpif.at:4484;ofproto-dpif - MAC learning;;
-862;ofproto-dpif.at:4573;ofproto-dpif - MAC table overflow;;
-863;ofproto-dpif.at:4633;ofproto-dpif - MAC table overflow fairness;;
-864;ofproto-dpif.at:5026;ofproto-dpif - sFlow packet sampling - IPv4 collector;;
-865;ofproto-dpif.at:5027;ofproto-dpif - sFlow packet sampling - IPv6 collector;;
-866;ofproto-dpif.at:5030;ofproto-dpif - sFlow LACP structures;;
-867;ofproto-dpif.at:5135;ofproto-dpif - NetFlow flow expiration - IPv4 collector;;
-868;ofproto-dpif.at:5136;ofproto-dpif - NetFlow flow expiration - IPv6 collector;;
-869;ofproto-dpif.at:5219;ofproto-dpif - NetFlow active expiration - IPv4 collector;;
-870;ofproto-dpif.at:5220;ofproto-dpif - NetFlow active expiration - IPv6 collector;;
-871;ofproto-dpif.at:5222;ofproto-dpif - flow stats;;
-872;ofproto-dpif.at:5243;ofproto-dpif - flow stats, set-n-threads;;
-873;ofproto-dpif.at:5266;ofproto-dpif - idle_age and hard_age increase over time;;
-874;ofproto-dpif.at:5356;ofproto-dpif - fin_timeout;;
-875;ofproto-dpif.at:5390;ofproto-dpif - ovs-appctl dpif/dump-dps;;
-876;ofproto-dpif.at:5402;ofproto-dpif - ovs-appctl dpif/show;;
-877;ofproto-dpif.at:5420;ofproto-dpif - ovs-appctl dpif/dump-flows;;
-878;ofproto-dpif.at:5453;ofproto-dpif - ovs-appctl dpif/get-flow;;
-879;ofproto-dpif.at:5472;ofproto-dpif - MPLS actions that result in a userspace action;;
-880;ofproto-dpif.at:5508;ofproto-dpif - MPLS actions that result in a drop;;
-881;ofproto-dpif.at:5546;ofproto-dpif - patch ports;;
-882;ofproto-dpif.at:5621;ofproto-dpif - patch ports - stack;;
-883;ofproto-dpif.at:5670;ofproto-dpif - port duration;;
-884;ofproto-dpif.at:5690;ofproto-dpif megaflow - port classification;;
-885;ofproto-dpif.at:5708;ofproto-dpif megaflow - L2 classification;;
-886;ofproto-dpif.at:5726;ofproto-dpif megaflow - L3 classification;;
-887;ofproto-dpif.at:5745;ofproto-dpif megaflow - IPv6 classification;;
-888;ofproto-dpif.at:5764;ofproto-dpif megaflow - L4 classification;;
-889;ofproto-dpif.at:5782;ofproto-dpif megaflow - normal;;
-890;ofproto-dpif.at:5797;ofproto-dpif megaflow - mpls;;
-891;ofproto-dpif.at:5846;ofproto-dpif megaflow - netflow - IPv4 collector;;
-892;ofproto-dpif.at:5847;ofproto-dpif megaflow - netflow - IPv6 collector;;
-893;ofproto-dpif.at:5849;ofproto-dpif megaflow - normal, active-backup bonding;;
-894;ofproto-dpif.at:5870;ofproto-dpif megaflow - normal, balance-slb bonding;;
-895;ofproto-dpif.at:5891;ofproto-dpif megaflow - normal, balance-tcp bonding;;
-896;ofproto-dpif.at:5929;ofproto-dpif megaflow - resubmit port action;;
-897;ofproto-dpif.at:5948;ofproto-dpif megaflow - resubmit table action;;
-898;ofproto-dpif.at:5968;ofproto-dpif megaflow - goto_table action;;
-899;ofproto-dpif.at:5987;ofproto-dpif megaflow - mirroring, select_all;;
-900;ofproto-dpif.at:6010;ofproto-dpif megaflow - mirroring, select_vlan;;
-901;ofproto-dpif.at:6033;ofproto-dpif megaflow - move action;;
-902;ofproto-dpif.at:6053;ofproto-dpif megaflow - push action;;
-903;ofproto-dpif.at:6071;ofproto-dpif megaflow - learning;;
-904;ofproto-dpif.at:6098;ofproto-dpif megaflow - tunnels;;
-905;ofproto-dpif.at:6131;ofproto-dpif megaflow - dec_ttl;;
-906;ofproto-dpif.at:6150;ofproto-dpif megaflow - set dl_dst;;
-907;ofproto-dpif.at:6171;ofproto-dpif megaflow - disabled;;
-908;ofproto-dpif.at:6204;ofproto-dpif - datapath port number change;;
-909;ofproto-dpif.at:6226;ofproto - bundle with variable bfd/cfm config;;
-910;ofproto-dpif.at:6304;ofproto-dpif - ofproto-dpif-monitor 1;;
-911;ofproto-dpif.at:6351;ofproto-dpif - ofproto-dpif-monitor 2;;
-912;ofproto-dpif.at:6364;ofproto-dpif - infinite resubmit;;
-913;ofproto-dpif.at:6377;ofproto-dpif - exponential resubmit chain;;
-914;ofproto-dpif.at:6392;ofproto-dpif - too many output actions;;
-915;ofproto-dpif.at:6410;ofproto-dpif - stack too deep;;
-916;ofproto-dpif.at:6427;ofproto-dpif packet-out controller;;
-917;ofproto-dpif.at:6472;ofproto-dpif packet-out controller (patch port);;
-918;ofproto-dpif.at:6529;ofproto-dpif packet-out goto_table;;
-919;ofproto-dpif.at:6585;ofproto-dpif packet-out table-miss (continue);;
-920;ofproto-dpif.at:6636;ofproto-dpif - ICMPv6;;
-921;ofproto-dpif.at:6656;ofproto-dpif - Neighbor Discovery set-field with checksum update;;
-922;ofproto-dpif.at:6678;ofproto-dpif - vlan matching;;
-923;bridge.at:7;bridge - ports that disappear get added back;;
-924;vlan-splinters.at:3;VLAN splinters;;
-925;ovsdb-log.at:3;create empty, reread;ovsdb log;
-926;ovsdb-log.at:18;write one, reread;ovsdb log;
-927;ovsdb-log.at:35;check that create fails if file exists;ovsdb log;
-928;ovsdb-log.at:55;write one, reread;ovsdb log;
-929;ovsdb-log.at:76;write one, reread, append;ovsdb log;
-930;ovsdb-log.at:106;write, reread one, overwrite;ovsdb log;
-931;ovsdb-log.at:132;write, add corrupted data, read;ovsdb log;
-932;ovsdb-log.at:154;write, add corrupted data, read, overwrite;ovsdb log;
-933;ovsdb-log.at:186;write, corrupt some data, read, overwrite;ovsdb log;
-934;ovsdb-log.at:219;write, truncate file, read, overwrite;ovsdb log;
-935;ovsdb-log.at:252;write bad JSON, read, overwrite;ovsdb log;
-936;ovsdb-types.at:3;integer - C;ovsdb positive;
-937;ovsdb-types.at:3;integer - Python;ovsdb positive python;
-938;ovsdb-types.at:5;real - C;ovsdb positive;
-939;ovsdb-types.at:5;real - Python;ovsdb positive python;
-940;ovsdb-types.at:7;boolean - C;ovsdb positive;
-941;ovsdb-types.at:7;boolean - Python;ovsdb positive python;
-942;ovsdb-types.at:9;string - C;ovsdb positive;
-943;ovsdb-types.at:9;string - Python;ovsdb positive python;
-944;ovsdb-types.at:11;uuid - C;ovsdb positive;
-945;ovsdb-types.at:11;uuid - Python;ovsdb positive python;
-946;ovsdb-types.at:13;void is not a valid atomic-type - C;ovsdb negative;
-947;ovsdb-types.at:13;void is not a valid atomic-type - Python;ovsdb negative;
-948;ovsdb-types.at:18;integer enum - C;ovsdb positive;
-949;ovsdb-types.at:18;integer enum - Python;ovsdb positive python;
-950;ovsdb-types.at:21;integer >= 5 - C;ovsdb positive;
-951;ovsdb-types.at:21;integer >= 5 - Python;ovsdb positive python;
-952;ovsdb-types.at:24;integer <= 7 - C;ovsdb positive;
-953;ovsdb-types.at:24;integer <= 7 - Python;ovsdb positive python;
-954;ovsdb-types.at:27;integer between -5 and 10 - C;ovsdb positive;
-955;ovsdb-types.at:27;integer between -5 and 10 - Python;ovsdb positive python;
-956;ovsdb-types.at:30;integer max may not be less than min - C;ovsdb negative;
-957;ovsdb-types.at:30;integer max may not be less than min - Python;ovsdb negative;
-958;ovsdb-types.at:34;real enum - C;ovsdb positive;
-959;ovsdb-types.at:34;real enum - Python;ovsdb positive python;
-960;ovsdb-types.at:37;real >= -1.5 - C;ovsdb positive;
-961;ovsdb-types.at:37;real >= -1.5 - Python;ovsdb positive python;
-962;ovsdb-types.at:40;real <= 1e5 - C;ovsdb positive;
-963;ovsdb-types.at:40;real <= 1e5 - Python;ovsdb positive python;
-964;ovsdb-types.at:43;real between -2.5 and 3.75 - C;ovsdb positive;
-965;ovsdb-types.at:43;real between -2.5 and 3.75 - Python;ovsdb positive python;
-966;ovsdb-types.at:46;real max may not be less than min - C;ovsdb negative;
-967;ovsdb-types.at:46;real max may not be less than min - Python;ovsdb negative;
-968;ovsdb-types.at:50;boolean - C;ovsdb positive;
-969;ovsdb-types.at:50;boolean - Python;ovsdb positive python;
-970;ovsdb-types.at:52;boolean enum - C;ovsdb positive;
-971;ovsdb-types.at:52;boolean enum - Python;ovsdb positive python;
-972;ovsdb-types.at:56;string enum - C;ovsdb positive;
-973;ovsdb-types.at:56;string enum - Python;ovsdb positive python;
-974;ovsdb-types.at:59;string minLength - C;ovsdb positive;
-975;ovsdb-types.at:59;string minLength - Python;ovsdb positive python;
-976;ovsdb-types.at:62;string maxLength - C;ovsdb positive;
-977;ovsdb-types.at:62;string maxLength - Python;ovsdb positive python;
-978;ovsdb-types.at:65;string minLength and maxLength - C;ovsdb positive;
-979;ovsdb-types.at:65;string minLength and maxLength - Python;ovsdb positive python;
-980;ovsdb-types.at:68;maxLength must not be less than minLength - C;ovsdb negative;
-981;ovsdb-types.at:68;maxLength must not be less than minLength - Python;ovsdb negative;
-982;ovsdb-types.at:71;maxLength must not be negative - C;ovsdb negative;
-983;ovsdb-types.at:71;maxLength must not be negative - Python;ovsdb negative;
-984;ovsdb-types.at:75;uuid enum - C;ovsdb positive;
-985;ovsdb-types.at:75;uuid enum - Python;ovsdb positive python;
-986;ovsdb-types.at:78;uuid refTable - C;ovsdb positive;
-987;ovsdb-types.at:78;uuid refTable - Python;ovsdb positive python;
-988;ovsdb-types.at:81;uuid refTable must be valid id - C;ovsdb negative;
-989;ovsdb-types.at:81;uuid refTable must be valid id - Python;ovsdb negative;
-990;ovsdb-types.at:85;void is not a valid base-type - C;ovsdb negative;
-991;ovsdb-types.at:85;void is not a valid base-type - Python;ovsdb negative;
-992;ovsdb-types.at:87;\"type\" member must be present - C;ovsdb negative;
-993;ovsdb-types.at:87;\"type\" member must be present - Python;ovsdb negative;
-994;ovsdb-types.at:92;simple integer - C;ovsdb positive;
-995;ovsdb-types.at:92;simple integer - Python;ovsdb positive python;
-996;ovsdb-types.at:94;simple real - C;ovsdb positive;
-997;ovsdb-types.at:94;simple real - Python;ovsdb positive python;
-998;ovsdb-types.at:96;simple boolean - C;ovsdb positive;
-999;ovsdb-types.at:96;simple boolean - Python;ovsdb positive python;
-1000;ovsdb-types.at:98;simple string - C;ovsdb positive;
-1001;ovsdb-types.at:98;simple string - Python;ovsdb positive python;
-1002;ovsdb-types.at:100;simple uuid - C;ovsdb positive;
-1003;ovsdb-types.at:100;simple uuid - Python;ovsdb positive python;
-1004;ovsdb-types.at:102;integer in object - C;ovsdb positive;
-1005;ovsdb-types.at:102;integer in object - Python;ovsdb positive python;
-1006;ovsdb-types.at:104;real in object with explicit min and max - C;ovsdb positive;
-1007;ovsdb-types.at:104;real in object with explicit min and max - Python;ovsdb positive python;
-1008;ovsdb-types.at:107;key type is required - C;ovsdb negative;
-1009;ovsdb-types.at:107;key type is required - Python;ovsdb negative;
-1010;ovsdb-types.at:109;void is not a valid type - C;ovsdb negative;
-1011;ovsdb-types.at:109;void is not a valid type - Python;ovsdb negative;
-1012;ovsdb-types.at:114;optional boolean - C;ovsdb positive set;
-1013;ovsdb-types.at:114;optional boolean - Python;ovsdb positive python set;
-1014;ovsdb-types.at:118;set of 1 to 3 uuids - C;ovsdb positive;
-1015;ovsdb-types.at:118;set of 1 to 3 uuids - Python;ovsdb positive python;
-1016;ovsdb-types.at:121;set of 0 to 3 strings - C;ovsdb positive;
-1017;ovsdb-types.at:121;set of 0 to 3 strings - Python;ovsdb positive python;
-1018;ovsdb-types.at:124;set of 0 or more integers - C;ovsdb positive;
-1019;ovsdb-types.at:124;set of 0 or more integers - Python;ovsdb positive python;
-1020;ovsdb-types.at:127;set of 1 or more reals - C;ovsdb positive;
-1021;ovsdb-types.at:127;set of 1 or more reals - Python;ovsdb positive python;
-1022;ovsdb-types.at:131;set max cannot be less than min - C;ovsdb negative;
-1023;ovsdb-types.at:131;set max cannot be less than min - Python;ovsdb negative;
-1024;ovsdb-types.at:134;set max cannot be negative - C;ovsdb negative;
-1025;ovsdb-types.at:134;set max cannot be negative - Python;ovsdb negative;
-1026;ovsdb-types.at:137;set min cannot be negative - C;ovsdb negative;
-1027;ovsdb-types.at:137;set min cannot be negative - Python;ovsdb negative;
-1028;ovsdb-types.at:140;set min cannot be greater than one - C;ovsdb negative;
-1029;ovsdb-types.at:140;set min cannot be greater than one - Python;ovsdb negative;
-1030;ovsdb-types.at:146;map of 1 integer to boolean - C;ovsdb positive;
-1031;ovsdb-types.at:146;map of 1 integer to boolean - Python;ovsdb positive python;
-1032;ovsdb-types.at:149;map of 1 boolean to integer, explicit min and max - C;ovsdb positive;
-1033;ovsdb-types.at:149;map of 1 boolean to integer, explicit min and max - Python;ovsdb positive python;
-1034;ovsdb-types.at:152;map of 1 to 5 uuid to real - C;ovsdb positive;
-1035;ovsdb-types.at:152;map of 1 to 5 uuid to real - Python;ovsdb positive python;
-1036;ovsdb-types.at:155;map of 0 to 10 string to uuid - C;ovsdb positive;
-1037;ovsdb-types.at:155;map of 0 to 10 string to uuid - Python;ovsdb positive python;
-1038;ovsdb-types.at:158;map of 1 to 20 real to string - C;ovsdb positive;
-1039;ovsdb-types.at:158;map of 1 to 20 real to string - Python;ovsdb positive python;
-1040;ovsdb-types.at:161;map of 0 or more string to real - C;ovsdb positive;
-1041;ovsdb-types.at:161;map of 0 or more string to real - Python;ovsdb positive python;
-1042;ovsdb-types.at:165;map key type is required - C;ovsdb negative;
-1043;ovsdb-types.at:165;map key type is required - Python;ovsdb negative;
-1044;ovsdb-data.at:3;default atoms - C;ovsdb positive;
-1045;ovsdb-data.at:3;default atoms - Python;ovsdb positive python;
-1046;ovsdb-data.at:11;default data - C;ovsdb positive;
-1047;ovsdb-data.at:11;default data - Python;ovsdb positive python;
-1048;ovsdb-data.at:76;integer atom from JSON - C;ovsdb positive;
-1049;ovsdb-data.at:76;integer atom from JSON - Python;ovsdb positive python;
-1050;ovsdb-data.at:89;integer atom from string;ovsdb positive;
-1051;ovsdb-data.at:102;real atom from JSON - C;ovsdb positive;
-1052;ovsdb-data.at:102;real atom from JSON - Python;ovsdb positive python;
-1053;ovsdb-data.at:119;real atom from string;ovsdb positive;
-1054;ovsdb-data.at:136;boolean atom from JSON - C;ovsdb positive;
-1055;ovsdb-data.at:136;boolean atom from JSON - Python;ovsdb positive python;
-1056;ovsdb-data.at:141;boolean atom from string;ovsdb positive;
-1057;ovsdb-data.at:146;string atom from JSON - C;ovsdb positive;
-1058;ovsdb-data.at:146;string atom from JSON - Python;ovsdb positive python;
-1059;ovsdb-data.at:152;string atom from string;ovsdb positive;
-1060;ovsdb-data.at:167;uuid atom from JSON - C;ovsdb positive;
-1061;ovsdb-data.at:167;uuid atom from JSON - Python;ovsdb positive python;
-1062;ovsdb-data.at:171;uuid atom from string;ovsdb positive;
-1063;ovsdb-data.at:175;integer atom sorting - C;ovsdb positive;
-1064;ovsdb-data.at:175;integer atom sorting - Python;ovsdb positive python;
-1065;ovsdb-data.at:179;real atom sorting - C;ovsdb positive;
-1066;ovsdb-data.at:179;real atom sorting - Python;ovsdb positive python;
-1067;ovsdb-data.at:183;boolean atom sorting - C;ovsdb positive;
-1068;ovsdb-data.at:183;boolean atom sorting - Python;ovsdb positive python;
-1069;ovsdb-data.at:187;string atom sorting - C;ovsdb positive;
-1070;ovsdb-data.at:187;string atom sorting - Python;ovsdb positive python;
-1071;ovsdb-data.at:191;uuid atom sorting - C;ovsdb positive;
-1072;ovsdb-data.at:191;uuid atom sorting - Python;ovsdb positive python;
-1073;ovsdb-data.at:228;real not acceptable integer JSON atom - C;ovsdb positive;
-1074;ovsdb-data.at:228;real not acceptable integer JSON atom - Python;ovsdb positive python;
-1075;ovsdb-data.at:234;no invalid UTF-8 sequences in strings;ovsdb positive;
-1076;ovsdb-data.at:249;no invalid UTF-8 sequences in strings - Python;ovsdb positive python;
-1077;ovsdb-data.at:257;real not acceptable integer string atom;ovsdb negative;
-1078;ovsdb-data.at:261;string \"true\" not acceptable boolean JSON atom - C;ovsdb positive;
-1079;ovsdb-data.at:261;string \"true\" not acceptable boolean JSON atom - Python;ovsdb positive python;
-1080;ovsdb-data.at:265;string \"true\" not acceptable boolean string atom;ovsdb negative;
-1081;ovsdb-data.at:269;integer not acceptable string JSON atom - C;ovsdb positive;
-1082;ovsdb-data.at:269;integer not acceptable string JSON atom - Python;ovsdb positive python;
-1083;ovsdb-data.at:273;uuid atom must be expressed as JSON array - C;ovsdb positive;
-1084;ovsdb-data.at:273;uuid atom must be expressed as JSON array - Python;ovsdb positive python;
-1085;ovsdb-data.at:277;named-uuid requires symbol table - C;ovsdb positive;
-1086;ovsdb-data.at:277;named-uuid requires symbol table - Python;ovsdb positive python;
-1087;ovsdb-data.at:281;empty string atom must be quoted;ovsdb negative;
-1088;ovsdb-data.at:285;quotes must be balanced;ovsdb negative;
-1089;ovsdb-data.at:289;quoted string must not contain unescaped quote;ovsdb negative;
-1090;ovsdb-data.at:293;quoted string must not end with backslash;ovsdb negative;
-1091;ovsdb-data.at:297;uuids must be valid;ovsdb negative;
-1092;ovsdb-data.at:303;integer atom enum - C;ovsdb positive;
-1093;ovsdb-data.at:303;integer atom enum - Python;ovsdb positive python;
-1094;ovsdb-data.at:326;real atom enum - C;ovsdb positive;
-1095;ovsdb-data.at:326;real atom enum - Python;ovsdb positive python;
-1096;ovsdb-data.at:343;boolean atom enum - C;ovsdb positive;
-1097;ovsdb-data.at:343;boolean atom enum - Python;ovsdb positive python;
-1098;ovsdb-data.at:350;string atom enum - C;ovsdb positive;
-1099;ovsdb-data.at:350;string atom enum - Python;ovsdb positive python;
-1100;ovsdb-data.at:365;uuid atom enum - C;ovsdb positive;
-1101;ovsdb-data.at:365;uuid atom enum - Python;ovsdb positive python;
-1102;ovsdb-data.at:376;integers >= 5 - C;ovsdb positive;
-1103;ovsdb-data.at:376;integers >= 5 - Python;ovsdb positive python;
-1104;ovsdb-data.at:389;integers <= -1 - C;ovsdb positive;
-1105;ovsdb-data.at:389;integers <= -1 - Python;ovsdb positive python;
-1106;ovsdb-data.at:400;integers in range -10 to 10 - C;ovsdb positive;
-1107;ovsdb-data.at:400;integers in range -10 to 10 - Python;ovsdb positive python;
-1108;ovsdb-data.at:421;reals >= 5 - C;ovsdb positive;
-1109;ovsdb-data.at:421;reals >= 5 - Python;ovsdb positive python;
-1110;ovsdb-data.at:434;reals <= -1 - C;ovsdb positive;
-1111;ovsdb-data.at:434;reals <= -1 - Python;ovsdb positive python;
-1112;ovsdb-data.at:445;reals in range -10 to 10 - C;ovsdb positive;
-1113;ovsdb-data.at:445;reals in range -10 to 10 - Python;ovsdb positive python;
-1114;ovsdb-data.at:466;strings at least 2 characters long - C;ovsdb positive;
-1115;ovsdb-data.at:466;strings at least 2 characters long - Python;ovsdb positive python;
-1116;ovsdb-data.at:484;strings no more than 2 characters long - C;ovsdb positive;
-1117;ovsdb-data.at:484;strings no more than 2 characters long - Python;ovsdb positive python;
-1118;ovsdb-data.at:499;integer JSON datum - C;ovsdb positive;
-1119;ovsdb-data.at:499;integer JSON datum - Python;ovsdb positive python;
-1120;ovsdb-data.at:505;integer string datum;ovsdb positive;
-1121;ovsdb-data.at:512;real JSON datum - C;ovsdb positive;
-1122;ovsdb-data.at:512;real JSON datum - Python;ovsdb positive python;
-1123;ovsdb-data.at:518;real string datum;ovsdb positive;
-1124;ovsdb-data.at:524;boolean JSON datum - C;ovsdb positive;
-1125;ovsdb-data.at:524;boolean JSON datum - Python;ovsdb positive python;
-1126;ovsdb-data.at:529;boolean string datum;ovsdb positive;
-1127;ovsdb-data.at:534;string JSON datum - C;ovsdb positive;
-1128;ovsdb-data.at:534;string JSON datum - Python;ovsdb positive python;
-1129;ovsdb-data.at:540;string string datum;ovsdb positive;
-1130;ovsdb-data.at:549;JSON optional boolean - C;ovsdb positive set;
-1131;ovsdb-data.at:549;JSON optional boolean - Python;ovsdb positive python set;
-1132;ovsdb-data.at:559;string optional boolean;ovsdb positive set;
-1133;ovsdb-data.at:569;JSON set of 0 or more integers - C;ovsdb positive;
-1134;ovsdb-data.at:569;JSON set of 0 or more integers - Python;ovsdb positive python;
-1135;ovsdb-data.at:586;string set of 0 or more integers;ovsdb positive;
-1136;ovsdb-data.at:601;JSON set of 1 to 3 uuids - C;ovsdb positive;
-1137;ovsdb-data.at:601;JSON set of 1 to 3 uuids - Python;ovsdb positive python;
-1138;ovsdb-data.at:612;string set of 1 to 3 uuids;ovsdb positive;
-1139;ovsdb-data.at:621;JSON set of 0 to 3 strings - C;ovsdb positive;
-1140;ovsdb-data.at:621;JSON set of 0 to 3 strings - Python;ovsdb positive python;
-1141;ovsdb-data.at:634;string set of 0 to 3 strings;ovsdb positive;
-1142;ovsdb-data.at:645;duplicate boolean not allowed in JSON set - C;ovsdb negative;
-1143;ovsdb-data.at:645;duplicate boolean not allowed in JSON set - Python;ovsdb negative;
-1144;ovsdb-data.at:649;duplicate boolean not allowed in string set;ovsdb negative;
-1145;ovsdb-data.at:653;duplicate integer not allowed in JSON set - C;ovsdb negative;
-1146;ovsdb-data.at:653;duplicate integer not allowed in JSON set - Python;ovsdb negative;
-1147;ovsdb-data.at:657;duplicate integer not allowed in string set;ovsdb negative;
-1148;ovsdb-data.at:661;duplicate real not allowed in JSON set - C;ovsdb negative;
-1149;ovsdb-data.at:661;duplicate real not allowed in JSON set - Python;ovsdb negative;
-1150;ovsdb-data.at:665;duplicate real not allowed in string set;ovsdb negative;
-1151;ovsdb-data.at:669;duplicate string not allowed in JSON set - C;ovsdb negative;
-1152;ovsdb-data.at:669;duplicate string not allowed in JSON set - Python;ovsdb negative;
-1153;ovsdb-data.at:673;duplicate string not allowed in string set;ovsdb negative;
-1154;ovsdb-data.at:677;duplicate uuid not allowed in JSON set - C;ovsdb negative;
-1155;ovsdb-data.at:677;duplicate uuid not allowed in JSON set - Python;ovsdb negative;
-1156;ovsdb-data.at:684;duplicate uuid not allowed in string set;ovsdb negative;
-1157;ovsdb-data.at:693;JSON map of 1 integer to boolean - C;ovsdb positive;
-1158;ovsdb-data.at:693;JSON map of 1 integer to boolean - Python;ovsdb positive python;
-1159;ovsdb-data.at:698;string map of 1 integer to boolean;ovsdb positive;
-1160;ovsdb-data.at:703;JSON map of at least 1 integer to boolean - C;ovsdb positive;
-1161;ovsdb-data.at:703;JSON map of at least 1 integer to boolean - Python;ovsdb positive python;
-1162;ovsdb-data.at:712;string map of at least 1 integer to boolean;ovsdb positive;
-1163;ovsdb-data.at:721;JSON map of 1 boolean to integer - C;ovsdb positive;
-1164;ovsdb-data.at:721;JSON map of 1 boolean to integer - Python;ovsdb positive python;
-1165;ovsdb-data.at:726;string map of 1 boolean to integer;ovsdb positive;
-1166;ovsdb-data.at:731;JSON map of 1 uuid to real - C;ovsdb positive;
-1167;ovsdb-data.at:731;JSON map of 1 uuid to real - Python;ovsdb positive python;
-1168;ovsdb-data.at:740;string map of 1 uuid to real;ovsdb positive;
-1169;ovsdb-data.at:749;JSON map of 10 string to string - C;ovsdb positive;
-1170;ovsdb-data.at:749;JSON map of 10 string to string - Python;ovsdb positive python;
-1171;ovsdb-data.at:763;string map of 10 string to string;ovsdb positive;
-1172;ovsdb-data.at:777;duplicate integer key not allowed in JSON map - C;ovsdb negative;
-1173;ovsdb-data.at:777;duplicate integer key not allowed in JSON map - Python;ovsdb negative;
-1174;ovsdb-data.at:782;duplicate integer key not allowed in string map;ovsdb negative;
-1175;ovsdb-column.at:3;ordinary column - C;ovsdb positive;
-1176;ovsdb-column.at:3;ordinary column - Python;ovsdb positive python;
-1177;ovsdb-column.at:7;immutable column - C;ovsdb positive;
-1178;ovsdb-column.at:7;immutable column - Python;ovsdb positive python;
-1179;ovsdb-column.at:11;ephemeral column - C;ovsdb positive;
-1180;ovsdb-column.at:11;ephemeral column - Python;ovsdb positive python;
-1181;ovsdb-table.at:3;non-root table with one column - C;ovsdb positive;
-1182;ovsdb-table.at:3;non-root table with one column - Python;ovsdb positive python;
-1183;ovsdb-table.at:7;immutable table with one column - C;ovsdb positive;
-1184;ovsdb-table.at:7;immutable table with one column - Python;ovsdb positive python;
-1185;ovsdb-table.at:13;root table with one column - C;ovsdb positive;
-1186;ovsdb-table.at:13;root table with one column - Python;ovsdb positive python;
-1187;ovsdb-table.at:19;non-root table with default_is_root=true - C;ovsdb positive;
-1188;ovsdb-table.at:19;non-root table with default_is_root=true - Python;ovsdb positive python;
-1189;ovsdb-table.at:23;root table with default_is_root=true - C;ovsdb positive;
-1190;ovsdb-table.at:23;root table with default_is_root=true - Python;ovsdb positive python;
-1191;ovsdb-table.at:29;table with maxRows of 2 - C;ovsdb positive;
-1192;ovsdb-table.at:29;table with maxRows of 2 - Python;ovsdb positive python;
-1193;ovsdb-table.at:34;table with index - C;ovsdb positive;
-1194;ovsdb-table.at:34;table with index - Python;ovsdb positive python;
-1195;ovsdb-table.at:40;table with syntax error in index - C;ovsdb negative;
-1196;ovsdb-table.at:40;table with syntax error in index - Python;ovsdb negative;
-1197;ovsdb-table.at:46;table with empty index - C;ovsdb negative;
-1198;ovsdb-table.at:46;table with empty index - Python;ovsdb negative;
-1199;ovsdb-table.at:52;table with index of ephemeral column - C;ovsdb negative;
-1200;ovsdb-table.at:52;table with index of ephemeral column - Python;ovsdb negative;
-1201;ovsdb-table.at:59;column names may not begin with _ - C;ovsdb negative table;
-1202;ovsdb-table.at:59;column names may not begin with _ - Python;ovsdb negative table;
-1203;ovsdb-table.at:65;table must have at least one column (1) - C;ovsdb negative;
-1204;ovsdb-table.at:65;table must have at least one column (1) - Python;ovsdb negative;
-1205;ovsdb-table.at:69;table must have at least one column (2) - C;ovsdb negative;
-1206;ovsdb-table.at:69;table must have at least one column (2) - Python;ovsdb negative;
-1207;ovsdb-table.at:73;table maxRows must be positive - C;ovsdb negative;
-1208;ovsdb-table.at:73;table maxRows must be positive - Python;ovsdb negative;
-1209;ovsdb-row.at:3;row with one string column;ovsdb positive;
-1210;ovsdb-row.at:19;row with one integer column;ovsdb positive;
-1211;ovsdb-row.at:35;row with one real column;ovsdb positive;
-1212;ovsdb-row.at:51;row with one boolean column;ovsdb positive;
-1213;ovsdb-row.at:64;row with one uuid column;ovsdb positive;
-1214;ovsdb-row.at:77;row with set of 1 to 2 elements;ovsdb positive;
-1215;ovsdb-row.at:84;row with map of 1 to 2 elements;ovsdb positive;
-1216;ovsdb-row.at:91;row with several columns;ovsdb positive;
-1217;ovsdb-row.at:113;row hashing (scalars);ovsdb positive;
-1218;ovsdb-row.at:182;row hashing (sets);ovsdb positive;
-1219;ovsdb-row.at:235;row hashing (maps);ovsdb positive;
-1220;ovsdb-schema.at:3;schema with valid refTables - C;ovsdb positive;
-1221;ovsdb-schema.at:3;schema with valid refTables - Python;ovsdb positive python;
-1222;ovsdb-schema.at:30;schema with ephemeral strong references - C;ovsdb positive;
-1223;ovsdb-schema.at:30;schema with ephemeral strong references - Python;ovsdb positive python;
-1224;ovsdb-schema.at:61;schema without version number - C;ovsdb positive;
-1225;ovsdb-schema.at:61;schema without version number - Python;ovsdb positive python;
-1226;ovsdb-schema.at:71;schema with invalid refTables - C;ovsdb negative;
-1227;ovsdb-schema.at:71;schema with invalid refTables - Python;ovsdb negative;
-1228;ovsdb-schema.at:94;schema with invalid version number - C;ovsdb negative;
-1229;ovsdb-schema.at:94;schema with invalid version number - Python;ovsdb negative;
-1230;ovsdb-condition.at:3;null condition;ovsdb positive;
-1231;ovsdb-condition.at:9;conditions on scalars;ovsdb positive condition;
-1232;ovsdb-condition.at:75;disallowed conditions on scalars;ovsdb negative condition;
-1233;ovsdb-condition.at:112;conditions on sets;ovsdb positive condition;
-1234;ovsdb-condition.at:173;condition sorting;ovsdb positive;
-1235;ovsdb-condition.at:187;evaluating null condition;ovsdb positive;
-1236;ovsdb-condition.at:196;evaluating conditions on integers;ovsdb positive condition;
-1237;ovsdb-condition.at:221;evaluating conditions on reals;ovsdb positive condition;
-1238;ovsdb-condition.at:246;evaluating conditions on booleans;ovsdb positive condition;
-1239;ovsdb-condition.at:270;evaluating conditions on strings;ovsdb positive condition;
-1240;ovsdb-condition.at:295;evaluating conditions on UUIDs;ovsdb positive condition;
-1241;ovsdb-condition.at:321;evaluating conditions on sets;ovsdb positive condition;
-1242;ovsdb-condition.at:403;evaluating conditions on maps (1);ovsdb positive condition;
-1243;ovsdb-condition.at:488;evaluating conditions on maps (2);ovsdb positive condition;
-1244;ovsdb-condition.at:580;evaluating conditions on optional integers;ovsdb positive condition;
-1245;ovsdb-condition.at:607;evaluating conditions on optional strings;ovsdb positive condition;
-1246;ovsdb-condition.at:634;evaluating conditions on optional reals;ovsdb positive condition;
-1247;ovsdb-mutation.at:3;null mutation;ovsdb positive;
-1248;ovsdb-mutation.at:9;mutations on scalars;ovsdb positive mutation;
-1249;ovsdb-mutation.at:37;disallowed mutations on scalars;ovsdb negative mutation;
-1250;ovsdb-mutation.at:102;disallowed mutations on immutable columns;ovsdb negative mutation;
-1251;ovsdb-mutation.at:114;mutations on sets;ovsdb positive mutation;
-1252;ovsdb-mutation.at:166;executing null mutation;ovsdb positive;
-1253;ovsdb-mutation.at:179;executing mutations on integers;ovsdb positive mutation;
-1254;ovsdb-mutation.at:216;integer overflow detection;ovsdb positive mutation;
-1255;ovsdb-mutation.at:297;executing mutations on integers with constraints;ovsdb positive mutation;
-1256;ovsdb-mutation.at:336;executing mutations on reals;ovsdb positive mutation;
-1257;ovsdb-mutation.at:367;real overflow detection;ovsdb positive mutation;
-1258;ovsdb-mutation.at:410;executing mutations on reals with constraints;ovsdb positive mutation;
-1259;ovsdb-mutation.at:443;executing mutations on integer sets;ovsdb positive mutation;
-1260;ovsdb-mutation.at:517;executing mutations on integer sets with constraints;ovsdb positive mutation;
-1261;ovsdb-mutation.at:556;executing mutations on real sets;ovsdb positive mutation;
-1262;ovsdb-mutation.at:629;executing mutations on boolean sets;ovsdb positive mutation;
-1263;ovsdb-mutation.at:679;executing mutations on string sets;ovsdb positive mutation;
-1264;ovsdb-mutation.at:729;executing mutations on uuid sets;ovsdb positive mutation;
-1265;ovsdb-mutation.at:779;executing mutations on integer maps;ovsdb positive mutation;
-1266;ovsdb-query.at:3;queries on scalars;ovsdb positive query;
-1267;ovsdb-query.at:95;queries on sets;ovsdb positive query;
-1268;ovsdb-query.at:176;queries on maps (1);ovsdb positive query;
-1269;ovsdb-query.at:260;queries on maps (2);ovsdb positive query;
-1270;ovsdb-query.at:351;UUID-distinct queries on scalars;ovsdb positive query;
-1271;ovsdb-query.at:444;Boolean-distinct queries on scalars;ovsdb positive query;
-1272;ovsdb-query.at:537;parse colunn set containing bad name;ovsdb negative;
-1273;ovsdb-transaction.at:3;empty table, empty transaction;ovsdb positive;
-1274;ovsdb-transaction.at:17;nonempty table, empty transaction;ovsdb positive;
-1275;ovsdb-transaction.at:41;insert, commit;ovsdb positive transaction;
-1276;ovsdb-transaction.at:70;insert, abort;ovsdb positive transaction;
-1277;ovsdb-transaction.at:98;modify, commit;ovsdb positive transaction;
-1278;ovsdb-transaction.at:127;modify, abort;ovsdb positive transaction;
-1279;ovsdb-transaction.at:156;delete, commit;ovsdb positive transaction;
-1280;ovsdb-transaction.at:181;delete, abort;ovsdb positive transaction;
-1281;ovsdb-transaction.at:207;modify, delete, commit;ovsdb positive transaction;
-1282;ovsdb-transaction.at:234;modify, delete, abort;ovsdb positive transaction;
-1283;ovsdb-transaction.at:262;insert, delete, commit;ovsdb positive transaction;
-1284;ovsdb-transaction.at:291;insert, delete, abort;ovsdb positive transaction;
-1285;ovsdb-transaction.at:322;insert, modify, delete, commit;ovsdb positive transaction;
-1286;ovsdb-transaction.at:353;insert, modify, delete, abort;ovsdb positive transaction;
-1287;ovsdb-transaction.at:385;deletes are aborted cleanly;ovsdb positive transaction;
-1288;ovsdb-execution.at:147;uuid-name must be ;ovsdb execute execution positive;
-1289;ovsdb-execution.at:157;named-uuid must be ;ovsdb execute execution positive;
-1290;ovsdb-execution.at:166;duplicate uuid-name not allowed;ovsdb execute execution positive;
-1291;ovsdb-execution.at:1102;insert default row, query table;ovsdb execute execution positive;
-1292;ovsdb-execution.at:1102;insert row, query table;ovsdb execute execution positive;
-1293;ovsdb-execution.at:1102;insert rows, query by value;ovsdb execute execution positive;
-1294;ovsdb-execution.at:1102;insert rows, query by named-uuid;ovsdb execute execution positive;
-1295;ovsdb-execution.at:1102;insert rows, update rows by value;ovsdb execute execution positive;
-1296;ovsdb-execution.at:1102;insert rows, mutate rows;ovsdb execute execution positive;
-1297;ovsdb-execution.at:1102;insert rows, delete by named-uuid;ovsdb execute execution positive;
-1298;ovsdb-execution.at:1102;insert rows, delete rows by value;ovsdb execute execution positive;
-1299;ovsdb-execution.at:1102;insert rows, delete by (non-matching) value;ovsdb execute execution positive;
-1300;ovsdb-execution.at:1102;insert rows, delete all;ovsdb execute execution positive;
-1301;ovsdb-execution.at:1102;insert row, query table, commit;ovsdb execute execution positive;
-1302;ovsdb-execution.at:1102;insert row, query table, commit durably;ovsdb execute execution positive;
-1303;ovsdb-execution.at:1102;equality wait with correct rows;ovsdb execute execution positive;
-1304;ovsdb-execution.at:1102;equality wait with extra row;ovsdb execute execution positive;
-1305;ovsdb-execution.at:1102;equality wait with missing row;ovsdb execute execution positive;
-1306;ovsdb-execution.at:1102;inequality wait with correct rows;ovsdb execute execution positive;
-1307;ovsdb-execution.at:1102;inequality wait with extra row;ovsdb execute execution positive;
-1308;ovsdb-execution.at:1102;inequality wait with missing row;ovsdb execute execution positive;
-1309;ovsdb-execution.at:1102;insert and update constraints;ovsdb execute execution positive;
-1310;ovsdb-execution.at:1102;index uniqueness checking;ovsdb execute execution positive;
-1311;ovsdb-execution.at:1102;referential integrity -- simple;ovsdb execute execution positive;
-1312;ovsdb-execution.at:1102;referential integrity -- mutual references;ovsdb execute execution positive;
-1313;ovsdb-execution.at:1102;weak references;ovsdb execute execution positive;
-1314;ovsdb-execution.at:1102;immutable columns;ovsdb execute execution positive;
-1315;ovsdb-execution.at:1102;garbage collection;ovsdb execute execution positive;
-1316;ovsdb-trigger.at:15;trigger fires immediately;ovsdb execute execution trigger positive;
-1317;ovsdb-trigger.at:38;trigger times out;ovsdb execute execution trigger positive;
-1318;ovsdb-trigger.at:61;trigger fires after delay;ovsdb execute execution trigger positive;
-1319;ovsdb-trigger.at:92;delayed trigger modifies database;ovsdb execute execution trigger positive;
-1320;ovsdb-trigger.at:132;one delayed trigger wakes up another;ovsdb execute execution trigger positive;
-1321;ovsdb-tool.at:30;insert default row, query table;ovsdb file positive;
-1322;ovsdb-tool.at:30;insert row, query table;ovsdb file positive;
-1323;ovsdb-tool.at:30;insert rows, query by value;ovsdb file positive;
-1324;ovsdb-tool.at:30;insert rows, query by named-uuid;ovsdb file positive;
-1325;ovsdb-tool.at:30;insert rows, update rows by value;ovsdb file positive;
-1326;ovsdb-tool.at:30;insert rows, mutate rows;ovsdb file positive;
-1327;ovsdb-tool.at:30;insert rows, delete by named-uuid;ovsdb file positive;
-1328;ovsdb-tool.at:30;insert rows, delete rows by value;ovsdb file positive;
-1329;ovsdb-tool.at:30;insert rows, delete by (non-matching) value;ovsdb file positive;
-1330;ovsdb-tool.at:30;insert rows, delete all;ovsdb file positive;
-1331;ovsdb-tool.at:30;insert row, query table, commit;ovsdb file positive;
-1332;ovsdb-tool.at:30;insert row, query table, commit durably;ovsdb file positive;
-1333;ovsdb-tool.at:30;equality wait with correct rows;ovsdb file positive;
-1334;ovsdb-tool.at:30;equality wait with extra row;ovsdb file positive;
-1335;ovsdb-tool.at:30;equality wait with missing row;ovsdb file positive;
-1336;ovsdb-tool.at:30;inequality wait with correct rows;ovsdb file positive;
-1337;ovsdb-tool.at:30;inequality wait with extra row;ovsdb file positive;
-1338;ovsdb-tool.at:30;inequality wait with missing row;ovsdb file positive;
-1339;ovsdb-tool.at:30;insert and update constraints;ovsdb file positive;
-1340;ovsdb-tool.at:30;index uniqueness checking;ovsdb file positive;
-1341;ovsdb-tool.at:30;referential integrity -- simple;ovsdb file positive;
-1342;ovsdb-tool.at:30;referential integrity -- mutual references;ovsdb file positive;
-1343;ovsdb-tool.at:30;weak references;ovsdb file positive;
-1344;ovsdb-tool.at:30;immutable columns;ovsdb file positive;
-1345;ovsdb-tool.at:30;garbage collection;ovsdb file positive;
-1346;ovsdb-tool.at:32;transaction comments;ovsdb file positive;
-1347;ovsdb-tool.at:50;ovsdb-tool compact;ovsdb file positive;
-1348;ovsdb-tool.at:158;ovsdb-tool convert -- removing a column;ovsdb file positive;
-1349;ovsdb-tool.at:226;ovsdb-tool convert -- adding a column;ovsdb file positive;
-1350;ovsdb-tool.at:293;ovsdb-tool schema-version;ovsdb file positive;
-1351;ovsdb-tool.at:300;ovsdb-tool db-version;ovsdb file positive;
-1352;ovsdb-tool.at:309;ovsdb-tool schema-cksum;ovsdb file positive;
-1353;ovsdb-tool.at:316;ovsdb-tool db-cksum;ovsdb file positive;
-1354;ovsdb-tool.at:325;ovsdb-tool needs-conversion (no conversion needed);ovsdb file positive;
-1355;ovsdb-tool.at:334;ovsdb-tool needs-conversion (conversion needed);ovsdb file positive;
-1356;ovsdb-server.at:39;insert default row, query table;ovsdb server positive unix;
-1357;ovsdb-server.at:39;insert row, query table;ovsdb server positive unix;
-1358;ovsdb-server.at:39;insert rows, query by value;ovsdb server positive unix;
-1359;ovsdb-server.at:39;insert rows, query by named-uuid;ovsdb server positive unix;
-1360;ovsdb-server.at:39;insert rows, update rows by value;ovsdb server positive unix;
-1361;ovsdb-server.at:39;insert rows, mutate rows;ovsdb server positive unix;
-1362;ovsdb-server.at:39;insert rows, delete by named-uuid;ovsdb server positive unix;
-1363;ovsdb-server.at:39;insert rows, delete rows by value;ovsdb server positive unix;
-1364;ovsdb-server.at:39;insert rows, delete by (non-matching) value;ovsdb server positive unix;
-1365;ovsdb-server.at:39;insert rows, delete all;ovsdb server positive unix;
-1366;ovsdb-server.at:39;insert row, query table, commit;ovsdb server positive unix;
-1367;ovsdb-server.at:39;insert row, query table, commit durably;ovsdb server positive unix;
-1368;ovsdb-server.at:39;equality wait with correct rows;ovsdb server positive unix;
-1369;ovsdb-server.at:39;equality wait with extra row;ovsdb server positive unix;
-1370;ovsdb-server.at:39;equality wait with missing row;ovsdb server positive unix;
-1371;ovsdb-server.at:39;inequality wait with correct rows;ovsdb server positive unix;
-1372;ovsdb-server.at:39;inequality wait with extra row;ovsdb server positive unix;
-1373;ovsdb-server.at:39;inequality wait with missing row;ovsdb server positive unix;
-1374;ovsdb-server.at:39;insert and update constraints;ovsdb server positive unix;
-1375;ovsdb-server.at:39;index uniqueness checking;ovsdb server positive unix;
-1376;ovsdb-server.at:39;referential integrity -- simple;ovsdb server positive unix;
-1377;ovsdb-server.at:39;referential integrity -- mutual references;ovsdb server positive unix;
-1378;ovsdb-server.at:39;weak references;ovsdb server positive unix;
-1379;ovsdb-server.at:39;immutable columns;ovsdb server positive unix;
-1380;ovsdb-server.at:39;garbage collection;ovsdb server positive unix;
-1381;ovsdb-server.at:43;truncating corrupted database log;ovsdb server positive unix;
-1382;ovsdb-server.at:91;truncating database log with bad transaction;ovsdb server positive unix;
-1383;ovsdb-server.at:140;ovsdb-client get-schema-version;ovsdb server positive;
-1384;ovsdb-server.at:151;database multiplexing implementation;ovsdb server positive;
-1385;ovsdb-server.at:171;ovsdb-server/add-db and remove-db;ovsdb server positive;
-1386;ovsdb-server.at:256;ovsdb-server/add-db with --monitor;ovsdb server positive;
-1387;ovsdb-server.at:289;ovsdb-server/add-db and remove-db with --monitor;ovsdb server positive;
-1388;ovsdb-server.at:320;--remote=db: implementation;ovsdb server positive;
-1389;ovsdb-server.at:385;ovsdb-server/add-remote and remove-remote;ovsdb server positive;
-1390;ovsdb-server.at:439;ovsdb-server/add-remote with --monitor;ovsdb server positive;
-1391;ovsdb-server.at:470;ovsdb-server/add-remote and remove-remote with --monitor;ovsdb server positive;
-1392;ovsdb-server.at:505;SSL db: implementation;ovsdb server positive ssl \$5;
-1393;ovsdb-server.at:562;compacting online;ovsdb server compact;
-1394;ovsdb-server.at:695;ovsdb-server combines updates on backlogged connections;;
-1395;ovsdb-server.at:832;insert default row, query table;ovsdb server positive ssl;
-1396;ovsdb-server.at:832;insert row, query table;ovsdb server positive ssl;
-1397;ovsdb-server.at:832;insert rows, query by value;ovsdb server positive ssl;
-1398;ovsdb-server.at:832;insert rows, query by named-uuid;ovsdb server positive ssl;
-1399;ovsdb-server.at:832;insert rows, update rows by value;ovsdb server positive ssl;
-1400;ovsdb-server.at:832;insert rows, mutate rows;ovsdb server positive ssl;
-1401;ovsdb-server.at:832;insert rows, delete by named-uuid;ovsdb server positive ssl;
-1402;ovsdb-server.at:832;insert rows, delete rows by value;ovsdb server positive ssl;
-1403;ovsdb-server.at:832;insert rows, delete by (non-matching) value;ovsdb server positive ssl;
-1404;ovsdb-server.at:832;insert rows, delete all;ovsdb server positive ssl;
-1405;ovsdb-server.at:832;insert row, query table, commit;ovsdb server positive ssl;
-1406;ovsdb-server.at:832;insert row, query table, commit durably;ovsdb server positive ssl;
-1407;ovsdb-server.at:832;equality wait with correct rows;ovsdb server positive ssl;
-1408;ovsdb-server.at:832;equality wait with extra row;ovsdb server positive ssl;
-1409;ovsdb-server.at:832;equality wait with missing row;ovsdb server positive ssl;
-1410;ovsdb-server.at:832;inequality wait with correct rows;ovsdb server positive ssl;
-1411;ovsdb-server.at:832;inequality wait with extra row;ovsdb server positive ssl;
-1412;ovsdb-server.at:832;inequality wait with missing row;ovsdb server positive ssl;
-1413;ovsdb-server.at:832;insert and update constraints;ovsdb server positive ssl;
-1414;ovsdb-server.at:832;index uniqueness checking;ovsdb server positive ssl;
-1415;ovsdb-server.at:832;referential integrity -- simple;ovsdb server positive ssl;
-1416;ovsdb-server.at:832;referential integrity -- mutual references;ovsdb server positive ssl;
-1417;ovsdb-server.at:832;weak references;ovsdb server positive ssl;
-1418;ovsdb-server.at:832;immutable columns;ovsdb server positive ssl;
-1419;ovsdb-server.at:832;garbage collection;ovsdb server positive ssl;
-1420;ovsdb-server.at:871;insert default row, query table;ovsdb server positive ssl6;
-1421;ovsdb-server.at:875;ovsdb-client get-schema-version - tcp socket;ovsdb server positive tcp;
-1422;ovsdb-server.at:921;insert default row, query table;ovsdb server positive tcp;
-1423;ovsdb-server.at:921;insert row, query table;ovsdb server positive tcp;
-1424;ovsdb-server.at:921;insert rows, query by value;ovsdb server positive tcp;
-1425;ovsdb-server.at:921;insert rows, query by named-uuid;ovsdb server positive tcp;
-1426;ovsdb-server.at:921;insert rows, update rows by value;ovsdb server positive tcp;
-1427;ovsdb-server.at:921;insert rows, mutate rows;ovsdb server positive tcp;
-1428;ovsdb-server.at:921;insert rows, delete by named-uuid;ovsdb server positive tcp;
-1429;ovsdb-server.at:921;insert rows, delete rows by value;ovsdb server positive tcp;
-1430;ovsdb-server.at:921;insert rows, delete by (non-matching) value;ovsdb server positive tcp;
-1431;ovsdb-server.at:921;insert rows, delete all;ovsdb server positive tcp;
-1432;ovsdb-server.at:921;insert row, query table, commit;ovsdb server positive tcp;
-1433;ovsdb-server.at:921;insert row, query table, commit durably;ovsdb server positive tcp;
-1434;ovsdb-server.at:921;equality wait with correct rows;ovsdb server positive tcp;
-1435;ovsdb-server.at:921;equality wait with extra row;ovsdb server positive tcp;
-1436;ovsdb-server.at:921;equality wait with missing row;ovsdb server positive tcp;
-1437;ovsdb-server.at:921;inequality wait with correct rows;ovsdb server positive tcp;
-1438;ovsdb-server.at:921;inequality wait with extra row;ovsdb server positive tcp;
-1439;ovsdb-server.at:921;inequality wait with missing row;ovsdb server positive tcp;
-1440;ovsdb-server.at:921;insert and update constraints;ovsdb server positive tcp;
-1441;ovsdb-server.at:921;index uniqueness checking;ovsdb server positive tcp;
-1442;ovsdb-server.at:921;referential integrity -- simple;ovsdb server positive tcp;
-1443;ovsdb-server.at:921;referential integrity -- mutual references;ovsdb server positive tcp;
-1444;ovsdb-server.at:921;weak references;ovsdb server positive tcp;
-1445;ovsdb-server.at:921;immutable columns;ovsdb server positive tcp;
-1446;ovsdb-server.at:921;garbage collection;ovsdb server positive tcp;
-1447;ovsdb-server.at:959;insert default row, query table;ovsdb server positive tcp6;
-1448;ovsdb-server.at:996;insert default row, query table;ovsdb server positive transient;
-1449;ovsdb-server.at:996;insert row, query table;ovsdb server positive transient;
-1450;ovsdb-server.at:996;insert rows, query by value;ovsdb server positive transient;
-1451;ovsdb-server.at:996;insert rows, query by named-uuid;ovsdb server positive transient;
-1452;ovsdb-server.at:996;insert rows, update rows by value;ovsdb server positive transient;
-1453;ovsdb-server.at:996;insert rows, mutate rows;ovsdb server positive transient;
-1454;ovsdb-server.at:996;insert rows, delete by named-uuid;ovsdb server positive transient;
-1455;ovsdb-server.at:996;insert rows, delete rows by value;ovsdb server positive transient;
-1456;ovsdb-server.at:996;insert rows, delete by (non-matching) value;ovsdb server positive transient;
-1457;ovsdb-server.at:996;insert rows, delete all;ovsdb server positive transient;
-1458;ovsdb-server.at:996;insert row, query table, commit;ovsdb server positive transient;
-1459;ovsdb-server.at:996;insert row, query table, commit durably;ovsdb server positive transient;
-1460;ovsdb-server.at:996;equality wait with correct rows;ovsdb server positive transient;
-1461;ovsdb-server.at:996;equality wait with extra row;ovsdb server positive transient;
-1462;ovsdb-server.at:996;equality wait with missing row;ovsdb server positive transient;
-1463;ovsdb-server.at:996;inequality wait with correct rows;ovsdb server positive transient;
-1464;ovsdb-server.at:996;inequality wait with extra row;ovsdb server positive transient;
-1465;ovsdb-server.at:996;inequality wait with missing row;ovsdb server positive transient;
-1466;ovsdb-server.at:996;insert and update constraints;ovsdb server positive transient;
-1467;ovsdb-server.at:996;index uniqueness checking;ovsdb server positive transient;
-1468;ovsdb-server.at:996;referential integrity -- simple;ovsdb server positive transient;
-1469;ovsdb-server.at:996;referential integrity -- mutual references;ovsdb server positive transient;
-1470;ovsdb-server.at:996;weak references;ovsdb server positive transient;
-1471;ovsdb-server.at:996;immutable columns;ovsdb server positive transient;
-1472;ovsdb-server.at:996;garbage collection;ovsdb server positive transient;
-1473;ovsdb-monitor.at:48;monitor insert into empty table;ovsdb server monitor positive;
-1474;ovsdb-monitor.at:60;monitor insert into populated table;ovsdb server monitor positive;
-1475;ovsdb-monitor.at:78;monitor delete;ovsdb server monitor positive;
-1476;ovsdb-monitor.at:96;monitor row update;ovsdb server monitor positive;
-1477;ovsdb-monitor.at:116;monitor no-op row updates;ovsdb server monitor positive;
-1478;ovsdb-monitor.at:139;monitor insert-and-update transaction;ovsdb server monitor positive;
-1479;ovsdb-monitor.at:162;monitor insert-update-and-delete transaction;ovsdb server monitor positive;
-1480;ovsdb-monitor.at:191;monitor weak reference change;ovsdb server monitor positive;
-1481;ovsdb-monitor.at:226;monitor insert-update-and-delete transaction;ovsdb server monitor positive;
-1482;ovsdb-monitor.at:277;monitor all operations;ovsdb server monitor positive;
-1483;ovsdb-monitor.at:297;monitor initial only;ovsdb server monitor positive;
-1484;ovsdb-monitor.at:304;monitor insert only;ovsdb server monitor positive;
-1485;ovsdb-monitor.at:311;monitor delete only;ovsdb server monitor positive;
-1486;ovsdb-monitor.at:319;monitor modify only;ovsdb server monitor positive;
-1487;ovsdb-idl.at:103;simple idl, initially empty, no ops - C;ovsdb server idl positive;
-1488;ovsdb-idl.at:103;simple idl, initially empty, no ops - Python;ovsdb server idl positive python;
-1489;ovsdb-idl.at:103;simple idl, initially empty, no ops - Python tcp;ovsdb server idl positive python with tcp socket;
-1490;ovsdb-idl.at:103;simple idl, initially empty, no ops - Python tcp6;ovsdb server idl positive python with tcp6 socket;
-1491;ovsdb-idl.at:110;simple idl, initially empty, various ops - C;ovsdb server idl positive;
-1492;ovsdb-idl.at:110;simple idl, initially empty, various ops - Python;ovsdb server idl positive python;
-1493;ovsdb-idl.at:110;simple idl, initially empty, various ops - Python tcp;ovsdb server idl positive python with tcp socket;
-1494;ovsdb-idl.at:110;simple idl, initially empty, various ops - Python tcp6;ovsdb server idl positive python with tcp6 socket;
-1495;ovsdb-idl.at:188;simple idl, initially populated - C;ovsdb server idl positive;
-1496;ovsdb-idl.at:188;simple idl, initially populated - Python;ovsdb server idl positive python;
-1497;ovsdb-idl.at:188;simple idl, initially populated - Python tcp;ovsdb server idl positive python with tcp socket;
-1498;ovsdb-idl.at:188;simple idl, initially populated - Python tcp6;ovsdb server idl positive python with tcp6 socket;
-1499;ovsdb-idl.at:219;simple idl, writing via IDL - C;ovsdb server idl positive;
-1500;ovsdb-idl.at:219;simple idl, writing via IDL - Python;ovsdb server idl positive python;
-1501;ovsdb-idl.at:219;simple idl, writing via IDL - Python tcp;ovsdb server idl positive python with tcp socket;
-1502;ovsdb-idl.at:219;simple idl, writing via IDL - Python tcp6;ovsdb server idl positive python with tcp6 socket;
-1503;ovsdb-idl.at:250;simple idl, handling verification failure - C;ovsdb server idl positive;
-1504;ovsdb-idl.at:250;simple idl, handling verification failure - Python;ovsdb server idl positive python;
-1505;ovsdb-idl.at:250;simple idl, handling verification failure - Python tcp;ovsdb server idl positive python with tcp socket;
-1506;ovsdb-idl.at:250;simple idl, handling verification failure - Python tcp6;ovsdb server idl positive python with tcp6 socket;
-1507;ovsdb-idl.at:281;simple idl, increment operation - C;ovsdb server idl positive;
-1508;ovsdb-idl.at:281;simple idl, increment operation - Python;ovsdb server idl positive python;
-1509;ovsdb-idl.at:281;simple idl, increment operation - Python tcp;ovsdb server idl positive python with tcp socket;
-1510;ovsdb-idl.at:281;simple idl, increment operation - Python tcp6;ovsdb server idl positive python with tcp6 socket;
-1511;ovsdb-idl.at:293;simple idl, aborting - C;ovsdb server idl positive;
-1512;ovsdb-idl.at:293;simple idl, aborting - Python;ovsdb server idl positive python;
-1513;ovsdb-idl.at:293;simple idl, aborting - Python tcp;ovsdb server idl positive python with tcp socket;
-1514;ovsdb-idl.at:293;simple idl, aborting - Python tcp6;ovsdb server idl positive python with tcp6 socket;
-1515;ovsdb-idl.at:307;simple idl, destroy without commit or abort - C;ovsdb server idl positive;
-1516;ovsdb-idl.at:307;simple idl, destroy without commit or abort - Python;ovsdb server idl positive python;
-1517;ovsdb-idl.at:307;simple idl, destroy without commit or abort - Python tcp;ovsdb server idl positive python with tcp socket;
-1518;ovsdb-idl.at:307;simple idl, destroy without commit or abort - Python tcp6;ovsdb server idl positive python with tcp6 socket;
-1519;ovsdb-idl.at:321;self-linking idl, consistent ops - C;ovsdb server idl positive;
-1520;ovsdb-idl.at:321;self-linking idl, consistent ops - Python;ovsdb server idl positive python;
-1521;ovsdb-idl.at:321;self-linking idl, consistent ops - Python tcp;ovsdb server idl positive python with tcp socket;
-1522;ovsdb-idl.at:321;self-linking idl, consistent ops - Python tcp6;ovsdb server idl positive python with tcp6 socket;
-1523;ovsdb-idl.at:365;self-linking idl, inconsistent ops - C;ovsdb server idl positive;
-1524;ovsdb-idl.at:365;self-linking idl, inconsistent ops - Python;ovsdb server idl positive python;
-1525;ovsdb-idl.at:365;self-linking idl, inconsistent ops - Python tcp;ovsdb server idl positive python with tcp socket;
-1526;ovsdb-idl.at:365;self-linking idl, inconsistent ops - Python tcp6;ovsdb server idl positive python with tcp6 socket;
-1527;ovsdb-idl.at:413;self-linking idl, sets - C;ovsdb server idl positive;
-1528;ovsdb-idl.at:413;self-linking idl, sets - Python;ovsdb server idl positive python;
-1529;ovsdb-idl.at:413;self-linking idl, sets - Python tcp;ovsdb server idl positive python with tcp socket;
-1530;ovsdb-idl.at:413;self-linking idl, sets - Python tcp6;ovsdb server idl positive python with tcp6 socket;
-1531;ovsdb-idl.at:463;external-linking idl, consistent ops - C;ovsdb server idl positive;
-1532;ovsdb-idl.at:463;external-linking idl, consistent ops - Python;ovsdb server idl positive python;
-1533;ovsdb-idl.at:463;external-linking idl, consistent ops - Python tcp;ovsdb server idl positive python with tcp socket;
-1534;ovsdb-idl.at:463;external-linking idl, consistent ops - Python tcp6;ovsdb server idl positive python with tcp6 socket;
-1535;ovsdb-idl.at:481;external-linking idl, insert ops - Python;ovsdb server idl positive python;
-1536;ovsdb-idl.at:491;getattr idl, insert ops - Python;ovsdb server idl positive python;
-1537;ovsdb-idl.at:500;row-from-json idl, whats this - Python;ovsdb server idl positive python;
-1538;ovsdb-idl.at:517;idl handling of missing tables and columns - C;ovsdb server idl positive;
-1539;ovs-vsctl.at:145;ovs-vsctl connection retry;;
-1540;ovs-vsctl.at:191;add-br a;ovs-vsctl;
-1541;ovs-vsctl.at:201;add-br a, add-br a;ovs-vsctl;
-1542;ovs-vsctl.at:211;add-br a, add-br b;ovs-vsctl;
-1543;ovs-vsctl.at:228;add-br a, add-br b, del-br a;ovs-vsctl;
-1544;ovs-vsctl.at:239;add-br a, del-br a, add-br a;ovs-vsctl;
-1545;ovs-vsctl.at:259;add-br a, add-port a a1, add-port a a2;ovs-vsctl;
-1546;ovs-vsctl.at:273;add-br a, add-port a a1, add-port a a1;ovs-vsctl;
-1547;ovs-vsctl.at:285;add-br a b, add-port a a1, add-port b b1, del-br a;ovs-vsctl;
-1548;ovs-vsctl.at:307;add-br a, add-bond a bond0 a1 a2 a3;ovs-vsctl;
-1549;ovs-vsctl.at:325;add-br a b, add-port a a1, add-port b b1, del-port a a1;ovs-vsctl;
-1550;ovs-vsctl.at:356;add-br a, add-bond a bond0 a1 a2 a3, del-port bond0;ovs-vsctl;
-1551;ovs-vsctl.at:373;external IDs;ovs-vsctl;
-1552;ovs-vsctl.at:429;controllers;controller ovs-vsctl;
-1553;ovs-vsctl.at:559;simple fake bridge (VLAN 9);ovs-vsctl fake-bridge;
-1554;ovs-vsctl.at:559;list bridges -- real and fake (VLAN 9);ovs-vsctl fake-bridge;
-1555;ovs-vsctl.at:559;simple fake bridge + del-br fake bridge (VLAN 9);ovs-vsctl fake-bridge;
-1556;ovs-vsctl.at:559;simple fake bridge + del-br real bridge (VLAN 9);ovs-vsctl fake-bridge;
-1557;ovs-vsctl.at:559;simple fake bridge + external IDs (VLAN 9);ovs-vsctl fake-bridge;
-1558;ovs-vsctl.at:560;simple fake bridge (VLAN 0);ovs-vsctl fake-bridge;
-1559;ovs-vsctl.at:560;list bridges -- real and fake (VLAN 0);ovs-vsctl fake-bridge;
-1560;ovs-vsctl.at:560;simple fake bridge + del-br fake bridge (VLAN 0);ovs-vsctl fake-bridge;
-1561;ovs-vsctl.at:560;simple fake bridge + del-br real bridge (VLAN 0);ovs-vsctl fake-bridge;
-1562;ovs-vsctl.at:560;simple fake bridge + external IDs (VLAN 0);ovs-vsctl fake-bridge;
-1563;ovs-vsctl.at:572;fake bridge on bond;ovs-vsctl fake-bridge;
-1564;ovs-vsctl.at:584;fake bridge on bond + del-br fake bridge;ovs-vsctl fake-bridge;
-1565;ovs-vsctl.at:596;fake bridge on bond + del-br real bridge;ovs-vsctl fake-bridge;
-1566;ovs-vsctl.at:608;managers;manager ovs-vsctl;
-1567;ovs-vsctl.at:634;database commands -- positive checks;ovs-vsctl;
-1568;ovs-vsctl.at:747;database commands -- negative checks;ovs-vsctl;
-1569;ovs-vsctl.at:872;database commands -- conditions;ovs-vsctl;
-1570;ovs-vsctl.at:1007;database commands -- wait-until immediately true;ovs-vsctl;
-1571;ovs-vsctl.at:1026;database commands -- wait-until must wait;ovs-vsctl;
-1572;ovs-vsctl.at:1060;--id option on create, get commands;ovs-vsctl;
-1573;ovs-vsctl.at:1109;unreferenced record warnings;ovs-vsctl;
-1574;ovs-vsctl.at:1143;created row UUID is wrong in same execution;ovs-vsctl;
-1575;ovs-vsctl.at:1180;--all option on destroy command;ovs-vsctl;
-1576;ovs-vsctl.at:1229;add-port -- reserved names 1;;
-1577;ovs-vsctl.at:1260;add-port -- reserved names 2;;
-1578;ovs-vsctl.at:1300;naming in db commands;;
-1579;ovs-monitor-ipsec.at:3;ovs-monitor-ipsec;;
-1580;ovs-xapi-sync.at:3;ovs-xapi-sync;;
-1581;interface-reconfigure.at:697;non-VLAN, non-bond;interface-reconfigure;
-1582;interface-reconfigure.at:774;VLAN, non-bond;interface-reconfigure;
-1583;interface-reconfigure.at:849;Bond, non-VLAN;interface-reconfigure;
-1584;interface-reconfigure.at:939;VLAN on bond;interface-reconfigure;
-1585;interface-reconfigure.at:1040;Re-create port with different types;interface-reconfigure;
-1586;stp.at:3;STP example from IEEE 802.1D-1998;stp;
-1587;stp.at:27;STP example from IEEE 802.1D-2004 figures 17.4 and 17.5;stp;
-1588;stp.at:70;STP example from IEEE 802.1D-2004 figure 17.6;stp;
-1589;stp.at:96;STP example from IEEE 802.1D-2004 figure 17.7;stp;
-1590;stp.at:125;STP.io.1.1: Link Failure;stp;
-1591;stp.at:164;STP.io.1.2: Repeated Network;stp;
-1592;stp.at:188;STP.io.1.4: Network Initialization;stp;
-1593;stp.at:214;STP.io.1.5: Topology Change;stp;
-1594;stp.at:267;STP.op.1.1 and STP.op.1.2;stp;
-1595;stp.at:281;STP.op.1.4: All Ports Initialized to Designated Ports;stp;
-1596;stp.at:302;STP.op.3.1: Root Bridge Selection: Root ID Values;stp;
-1597;stp.at:322;STP.op.3.3: Root Bridge Selection: Bridge ID Values;stp;
-1598;stp.at:345;STP.op.3.3: Root Bridge Selection: Bridge ID Values;stp;
-1599;stp.at:380;STP - dummy interface;;
-1600;rstp.at:3;RSTP Single bridge;rstp;
-1601;rstp.at:13;RSTP Link failure;rstp;
-1602;rstp.at:32;RSTP Double link Failure;rstp;
-1603;rstp.at:74;RSTP example from IEEE 802.1D-2004 figures 17.4 and 17.5;rstp;
-1604;rstp.at:111;RSTP example from IEEE 802.1D-2004 figure 17.6;rstp;
-1605;rstp.at:131;RSTP example from IEEE 802.1D-2004 figure 17.7;rstp;
-1606;rstp.at:163;RSTP - dummy interface;;
-1607;vlog.at:3;vlog - Python;;
-1608;vlog.at:104;vlog - vlog/reopen - Python;;
-1609;vlog.at:133;vlog - vlog/reopen without log file - Python;;
-1610;vlog.at:151;vlog - vlog/reopen can't reopen log file - Python;;
-1611;vlog.at:183;vlog - vlog/set and vlog/list - Python;;
-1612;vlog.at:238;vlog - RFC5424 facility;;
-1613;vlog.at:279;vlog - RFC5424 facility - Python;;
-1614;vtep-ctl.at:136;add-ps a;vtep-ctl;
-1615;vtep-ctl.at:144;add-ps a, add-ps a;vtep-ctl;
-1616;vtep-ctl.at:154;add-ps a, add-ps b;vtep-ctl;
-1617;vtep-ctl.at:163;add-ps a, add-ps b, del-ps a;vtep-ctl;
-1618;vtep-ctl.at:172;add-ps a, del-ps a, add-ps a;vtep-ctl;
-1619;vtep-ctl.at:186;add-ps a, add-port a a1, add-port a a2;vtep-ctl;
-1620;vtep-ctl.at:199;add-ps a, add-port a a1, add-port a a1;vtep-ctl;
-1621;vtep-ctl.at:211;add-ps a b, add-port a a1, add-port b b1, del-ps a;vtep-ctl;
-1622;vtep-ctl.at:232;add-ps a b, add-port a a1, add-port b b1, del-port a a1;vtep-ctl;
-1623;vtep-ctl.at:249;add-ps a b, add-port a p1, add-port b p1, del-port a p1;vtep-ctl;
-1624;vtep-ctl.at:272;add-ls a;vtep-ctl;
-1625;vtep-ctl.at:280;add-ls a, add-ls a;vtep-ctl;
-1626;vtep-ctl.at:290;add-ls a, add-ls b;vtep-ctl;
-1627;vtep-ctl.at:299;add-ls a, add-ls b, del-ls a;vtep-ctl;
-1628;vtep-ctl.at:308;add-ls a, del-ls a, add-ls a;vtep-ctl;
-1629;vtep-ctl.at:326;bind-ls ps1 pp1 300 ls1;vtep-ctl;
-1630;vtep-ctl.at:344;bind-ls ps1 pp1 300 ls1, bind-ls ps1 pp1 400 ls2;vtep-ctl;
-1631;vtep-ctl.at:366;bind-ls ps1 pp1 300, bind-ls ps2 pp2 300 ls2;vtep-ctl;
-1632;vtep-ctl.at:397;add-ucast-local ls1;vtep-ctl;
-1633;vtep-ctl.at:424;add-ucast-local ls1, overwrite;vtep-ctl;
-1634;vtep-ctl.at:444;add-ucast-local ls1, del-ucast-local ls1;vtep-ctl;
-1635;vtep-ctl.at:475;add-ucast-remote ls1;vtep-ctl;
-1636;vtep-ctl.at:502;add-ucast-remote ls1, overwrite;vtep-ctl;
-1637;vtep-ctl.at:522;add-ucast-remote ls1, del-ucast-remote ls1;vtep-ctl;
-1638;vtep-ctl.at:553;add-ucast-local ls1, add-ucast-remote ls1;vtep-ctl;
-1639;vtep-ctl.at:584;add-mcast-local ls1;vtep-ctl;
-1640;vtep-ctl.at:613;add-mcast-local ls1, del-mcast-local ls1;vtep-ctl;
-1641;vtep-ctl.at:650;add-mcast-remote ls1;vtep-ctl;
-1642;vtep-ctl.at:679;add-mcast-remote ls1, del-mcast-remote ls1;vtep-ctl;
-1643;vtep-ctl.at:716;add-mcast-local ls1, add-mcast-remote ls1;vtep-ctl;
-1644;vtep-ctl.at:751;add local and remote macs, clear-local-macs;vtep-ctl;
-1645;vtep-ctl.at:808;add local and remote macs, clear-remote-macs;vtep-ctl;
-1646;vtep-ctl.at:868;managers;manager vtep-ctl;
-1647;auto-attach.at:3;auto-attach - packet tests;auto-attach;
+64;library.at:217;test rcu;;
+65;heap.at:8;heap library -- insert delete same order;;
+66;heap.at:9;heap library -- insert delete reverse order;;
+67;heap.at:10;heap library -- insert delete every order;;
+68;heap.at:11;heap library -- insert delete same order with dups;;
+69;heap.at:12;heap library -- raw insert;;
+70;heap.at:13;heap library -- raw delete;;
+71;bundle.at:10;hrw bundle link selection;;
+72;bundle.at:80;active_backup bundle link selection;;
+73;bundle.at:151;hrw bundle single link selection;;
+74;bundle.at:159;hrw bundle no link selection;;
+75;bundle.at:166;bundle action missing argument;;
+76;bundle.at:172;bundle action bad fields;;
+77;bundle.at:178;bundle action bad algorithm;;
+78;bundle.at:184;bundle action bad slave type;;
+79;bundle.at:190;bundle action bad slave delimiter;;
+80;classifier.at:2;flow classifier - empty;;
+81;classifier.at:2;flow classifier - destroy null;;
+82;classifier.at:2;flow classifier - single rule;;
+83;classifier.at:2;flow classifier - rule replacement;;
+84;classifier.at:2;flow classifier - many rules in one list;;
+85;classifier.at:2;flow classifier - versioned many rules in one list;;
+86;classifier.at:2;flow classifier - many rules in one table;;
+87;classifier.at:2;flow classifier - versioned many rules in one table;;
+88;classifier.at:2;flow classifier - many rules in two tables;;
+89;classifier.at:2;flow classifier - versioned many rules in two tables;;
+90;classifier.at:2;flow classifier - many rules in five tables;;
+91;classifier.at:2;flow classifier - versioned many rules in five tables;;
+92;classifier.at:21;miniflow - miniflow;;
+93;classifier.at:21;miniflow - minimask_has_extra;;
+94;classifier.at:21;miniflow - minimask_combine;;
+95;classifier.at:31;flow classifier - lookup segmentation;;
+96;classifier.at:69;flow classifier - prefix lookup;;
+97;classifier.at:134;single conjunctive match;;
+98;classifier.at:171;multiple conjunctive match;;
+99;classifier.at:247;conjunctive match priority fallback;;
+100;classifier.at:293;conjunctive match and other actions;;
+101;check-structs.at:11;check struct tail padding;check-structs;
+102;check-structs.at:21;check struct internal alignment;check-structs;
+103;check-structs.at:32;check struct declared size;check-structs;
+104;check-structs.at:44;check wrong struct's declared size;check-structs;
+105;daemon.at:3;daemon;;
+106;daemon.at:22;daemon --monitor;;
+107;daemon.at:71;daemon --detach;;
+108;daemon.at:94;daemon --detach --monitor;;
+109;daemon.at:144;daemon --detach startup errors;;
+110;daemon.at:153;daemon --detach --monitor startup errors;;
+111;daemon.at:163;daemon --service;windows-service;
+112;daemon-py.at:3;daemon - Python;;
+113;daemon-py.at:21;daemon --monitor - Python;;
+114;daemon-py.at:64;daemon --monitor restart exit code - Python;;
+115;daemon-py.at:107;daemon --detach - Python;;
+116;daemon-py.at:123;daemon --detach --monitor - Python;;
+117;daemon-py.at:172;daemon --detach startup errors - Python;;
+118;daemon-py.at:181;daemon --detach --monitor startup errors - Python;;
+119;daemon-py.at:190;daemon --detach closes standard fds - Python;;
+120;daemon-py.at:210;daemon --detach --monitor closes standard fds;;
+121;ofp-actions.at:3;OpenFlow 1.0 action translation;ofp-actions of1.0;
+122;ofp-actions.at:153;OpenFlow 1.0 \"instruction\" translations;ofp-actions of1.0 instruction;
+123;ofp-actions.at:183;OpenFlow 1.1 action translation;ofp-actions of1.1;
+124;ofp-actions.at:320;OpenFlow 1.1 instruction translation;of1.1 instruction ofp-actions;
+125;ofp-actions.at:531;OpenFlow 1.2 action translation;ofp-actions of1.2;
+126;ofp-actions.at:557;OpenFlow 1.3 action translation;ofp-actions of1.3;
+127;ofp-actions.at:585;OpenFlow 1.5 action translation;ofp-actions of1.5;
+128;ofp-actions.at:609;ofp-actions - inconsistent MPLS actions;;
+129;ofp-actions.at:621;reg_load <-> set_field translation corner case;ofp-actions;
+130;ofp-print.at:3;empty;ofp-print;
+131;ofp-print.at:9;too short;ofp-print;
+132;ofp-print.at:17;wrong OpenFlow version;ofp-print;
+133;ofp-print.at:27;truncated message;ofp-print;
+134;ofp-print.at:35;message only uses part of buffer;ofp-print;
+135;ofp-print.at:44;OFPT_HELLO - ordinary;ofp-print;
+136;ofp-print.at:52;OFPT_HELLO with extra data;ofp-print;
+137;ofp-print.at:64;OFPT_HELLO with version bitmap;ofp-print;
+138;ofp-print.at:73;OFPT_HELLO with version bitmap and extra data;ofp-print;
+139;ofp-print.at:87;OFPT_HELLO with higher than supported version;ofp-print;
+140;ofp-print.at:106;OFPT_HELLO with contradictory version bitmaps;ofp-print;
+141;ofp-print.at:148;OFPT_ECHO_REQUEST, empty payload;ofp-print;
+142;ofp-print.at:155;OFPT_ECHO_REQUEST, 5-byte payload;ofp-print;
+143;ofp-print.at:163;OFPT_ECHO_REPLY, empty payload;ofp-print;
+144;ofp-print.at:170;OFPT_ECHO_REPLY, 5-byte payload;ofp-print;
+145;ofp-print.at:178;OFPT_FEATURES_REQUEST;ofp-print;
+146;ofp-print.at:185;OFPT_FEATURES_REPLY - OF1.0;ofp-print;
+147;ofp-print.at:235;OFPT_FEATURES_REPLY cut off mid-port - OF1.0;ofp-print;
+148;ofp-print.at:274;OFPT_FEATURES_REPLY - OF1.1;ofp-print;
+149;ofp-print.at:305;OFPT_FEATURES_REPLY cut off mid-port - OF1.1;ofp-print;
+150;ofp-print.at:334;OFPT_FEATURES_REPLY - OF1.2;ofp-print;
+151;ofp-print.at:365;OFPT_FEATURES_REPLY cut off mid-port - OF1.2;ofp-print;
+152;ofp-print.at:394;OFPT_FEATURES_REPLY - OF1.3;ofp-print;
+153;ofp-print.at:406;OFPT_FEATURES_REPLY - with auxiliary_id - OF1.3;ofp-print;
+154;ofp-print.at:418;OFPT_GET_CONFIG_REQUEST;ofp-print;
+155;ofp-print.at:425;OFPT_GET_CONFIG_REPLY, most common form;ofp-print;
+156;ofp-print.at:433;OFPT_GET_CONFIG_REPLY, frags and miss_send_len;ofp-print;
+157;ofp-print.at:440;OFPT_PACKET_IN - OF1.0;ofp-print;
+158;ofp-print.at:454;OFPT_PACKET_IN - OF1.0, with hex output of packet data;ofp-print;
+159;ofp-print.at:472;OFPT_PACKET_IN - OF1.1;ofp-print;
+160;ofp-print.at:487;OFPT_PACKET_IN - OF1.2;ofp-print;
+161;ofp-print.at:501;OFPT_PACKET_IN - OF1.2, with hex output of packet data;ofp-print;
+162;ofp-print.at:518;OFPT_PACKET_IN - OF1.3;ofp-print;
+163;ofp-print.at:533;OFPT_PACKET_IN - OF1.4;ofp-print;
+164;ofp-print.at:548;OFPT_PACKET_IN - OF1.5;ofp-print;
+165;ofp-print.at:563;OFPT_PACKET_IN - OF1.3, with hex output of packet data;ofp-print;
+166;ofp-print.at:581;OFPT_FLOW_REMOVED - OF1.0;ofp-print;
+167;ofp-print.at:595;OFPT_FLOW_REMOVED - OF1.2;ofp-print;
+168;ofp-print.at:606;OFPT_FLOW_REMOVED - OF1.3;ofp-print;
+169;ofp-print.at:617;OFPT_PORT_STATUS - OF1.0;ofp-print;
+170;ofp-print.at:635;OFPT_PORT_STATUS - OF1.1;ofp-print;
+171;ofp-print.at:654;OFPT_PORT_STATUS - OF1.4;ofp-print;
+172;ofp-print.at:674;OFPT_PACKET_OUT - OF1.0;ofp-print;
+173;ofp-print.at:688;OFPT_PACKET_OUT - OF1.0, with packet;ofp-print;
+174;ofp-print.at:703;OFPT_PACKET_OUT - OF1.0, with hex output of packet data;ofp-print;
+175;ofp-print.at:722;OFPT_PACKET_OUT - OF1.1;ofp-print;
+176;ofp-print.at:733;OFPT_PACKET_OUT - OF1.1, with packet;ofp-print;
+177;ofp-print.at:750;OFPT_FLOW_MOD - OF1.0 - low verbosity;ofp-print;
+178;ofp-print.at:768;OFPT_FLOW_MOD - OF1.1 - low verbosity;ofp-print;
+179;ofp-print.at:788;OFPT_FLOW_MOD - OF1.2 - low verbosity;ofp-print;
+180;ofp-print.at:808;OFPT_FLOW_MOD - OF1.0 - high verbosity;ofp-print;
+181;ofp-print.at:826;OFPT_FLOW_MOD - OF1.2 - low verbosity;ofp-print;
+182;ofp-print.at:845;OFPT_FLOW_MOD - OF1.3 - flags - low verbosity;ofp-print;
+183;ofp-print.at:863;OFPT_FLOW_MOD - OF1.2 - set-field ip_src;ofp-print;
+184;ofp-print.at:878;OFPT_FLOW_MOD - OF1.2 - set-field ip_dst;ofp-print;
+185;ofp-print.at:893;OFPT_FLOW_MOD - OF1.2 - set-field sctp_src;ofp-print;
+186;ofp-print.at:908;OFPT_FLOW_MOD - OF1.2 - set-field sctp_dst;ofp-print;
+187;ofp-print.at:923;OFPT_FLOW_MOD - OF1.2 - experimenter OXM;ofp-print;
+188;ofp-print.at:937;OFPT_FLOW_MOD - OF1.2 - set-field nd_target, nd_sll;ofp-print;
+189;ofp-print.at:955;OFPT_FLOW_MOD - OF1.3 - meter;ofp-print;
+190;ofp-print.at:966;OFPT_FLOW reply - OF1.2 - set-field ip_src;ofp-print;
+191;ofp-print.at:983;OFPT_FLOW reply - OF1.2 - set-field ip_dst;ofp-print;
+192;ofp-print.at:1000;OFPT_FLOW reply - OF1.2 - set-field sctp_src;ofp-print;
+193;ofp-print.at:1017;OFPT_FLOW reply - OF1.2 - set-field sctp_dst;ofp-print;
+194;ofp-print.at:1034;OFPT_PORT_MOD - OF1.0;ofp-print;
+195;ofp-print.at:1047;OFPT_PORT_MOD - OF1.1;ofp-print;
+196;ofp-print.at:1061;OFPT_PORT_MOD - OF1.2;ofp-print;
+197;ofp-print.at:1075;OFPT_PORT_MOD - OF1.3;ofp-print;
+198;ofp-print.at:1089;OFPT_PORT_MOD - OF1.4;ofp-print;
+199;ofp-print.at:1103;OFPT_TABLE_MOD - OF1.1;ofp-print;
+200;ofp-print.at:1112;OFPT_TABLE_MOD - OF1.2;ofp-print;
+201;ofp-print.at:1121;OFPT_TABLE_MOD - OF1.3;ofp-print;
+202;ofp-print.at:1130;OFPT_TABLE_MOD - OF1.4;ofp-print;
+203;ofp-print.at:1139;OFPST_DESC request;ofp-print ofpt_stats_request;
+204;ofp-print.at:1146;OFPST_DESC reply;ofp-print ofpt_stats_reply;
+205;ofp-print.at:1226;OFPST_FLOW request - OF1.0;ofp-print ofpt_stats_request;
+206;ofp-print.at:1238;OFPST_FLOW request - OF1.2;ofp-print ofpt_stats_request;
+207;ofp-print.at:1250;OFPST_FLOW request - OF1.3;ofp-print ofpt_stats_request;
+208;ofp-print.at:1262;OFPST_FLOW reply - OF1.0;ofp-print ofpt_stats_reply;
+209;ofp-print.at:1306;OFPST_FLOW reply - OF1.2;ofp-print ofpt_stats_reply;
+210;ofp-print.at:1341;OFPST_AGGREGATE request - OF1.0;ofp-print ofpt_stats_request;
+211;ofp-print.at:1353;OFPST_AGGREGATE request - OF1.2;ofp-print ofpt_stats_request;
+212;ofp-print.at:1365;OFPST_AGGREGATE request - OF1.3;ofp-print ofpt_stats_request;
+213;ofp-print.at:1377;OFPST_AGGREGATE reply - OF1.0;ofp-print ofpt_stats_reply;
+214;ofp-print.at:1388;OFPST_AGGREGATE reply - OF1.2;ofp-print ofpt_stats_reply;
+215;ofp-print.at:1399;OFPST_AGGREGATE reply - OF1.3;ofp-print ofpt_stats_reply;
+216;ofp-print.at:1410;OFPST_TABLE request - OF1.0;ofp-print ofpt_stats_request;
+217;ofp-print.at:1417;OFPST_TABLE request - OF1.1;ofp-print ofpt_stats_request;
+218;ofp-print.at:1424;OFPST_TABLE request - OF1.2;ofp-print ofpt_stats_request;
+219;ofp-print.at:1431;OFPST_TABLE request - OF1.3;ofp-print ofpt_stats_request;
+220;ofp-print.at:1438;OFPST_TABLE reply - OF1.0;ofp-print ofpt_stats_reply;
+221;ofp-print.at:1467;OFPST_TABLE reply - OF1.2;ofp-print ofpt_stats_reply;
+222;ofp-print.at:1559;OFPST_TABLE reply - OF1.3;ofp-print ofpt_stats_reply;
+223;ofp-print.at:1576;OFPST_PORT request - 1.0;ofp-print ofpt_stats_request;
+224;ofp-print.at:1586;OFPST_PORT request - 1.1;ofp-print ofpt_stats_request;
+225;ofp-print.at:1596;OFPST_PORT request - 1.2;ofp-print ofpt_stats_request;
+226;ofp-print.at:1606;OFPST_PORT request - 1.3;ofp-print ofpt_stats_request;
+227;ofp-print.at:1616;OFPST_PORT reply - OF1.0;ofp-print ofpt_stats_reply;
+228;ofp-print.at:1659;OFPST_PORT reply - OF1.2;ofp-print ofpt_stats_reply;
+229;ofp-print.at:1694;OFPST_PORT reply - OF1.3;ofp-print ofpt_stats_reply;
+230;ofp-print.at:1733;OFPST_PORT reply - OF1.4;ofp-print ofpt_stats_reply;
+231;ofp-print.at:1753;OFPST_QUEUE request - OF1.0;ofp-print ofpt_stats_request;
+232;ofp-print.at:1763;OFPST_QUEUE request - OF1.1;ofp-print ofpt_stats_request;
+233;ofp-print.at:1773;OFPST_QUEUE request - OF1.2;ofp-print ofpt_stats_request;
+234;ofp-print.at:1783;OFPST_QUEUE request - OF1.3;ofp-print ofpt_stats_request;
+235;ofp-print.at:1793;OFPST_QUEUE reply - OF1.0;ofp-print ofpt_stats_reply;
+236;ofp-print.at:1820;OFPST_QUEUE reply - OF1.1;ofp-print ofpt_stats_reply;
+237;ofp-print.at:1847;OFPST_QUEUE reply - OF1.2;ofp-print ofpt_stats_reply;
+238;ofp-print.at:1874;OFPST_QUEUE reply - OF1.3;ofp-print ofpt_stats_reply;
+239;ofp-print.at:1907;OFPST_QUEUE reply - OF1.4;ofp-print ofpt_stats_reply;
+240;ofp-print.at:1941;OFPST_GROUP request;ofp-print ofpt_stats_request;
+241;ofp-print.at:1950;OFPST_GROUP reply - OF1.1;ofp-print ofpt_stats_reply;
+242;ofp-print.at:1970;OFPST_GROUP reply - OF1.3;ofp-print ofpt_stats_reply;
+243;ofp-print.at:1992;OFPST_GROUP_DESC request - OF1.1;ofp-print ofpt_stats_request;
+244;ofp-print.at:2000;OFPST_GROUP_DESC request - OF1.5;ofp-print ofpt_stats_request;
+245;ofp-print.at:2009;OFPST_GROUP_DESC reply - OF1.1;ofp-print ofpt_stats_request;
+246;ofp-print.at:2026;OFPST_GROUP_DESC reply - OF1.5;ofp-print ofpt_stats_reply;
+247;ofp-print.at:2051;OFPST_GROUP_FEATURES request;ofp-print ofpt_stats_request;
+248;ofp-print.at:2059;OFPST_GROUP_FEATURES reply;ofp-print ofpt_stats_reply;
+249;ofp-print.at:2086;OFPST_PORT_DESC request - OF1.0;ofp-print ofpt_stats_request;
+250;ofp-print.at:2093;OFPST_PORT_DESC request - OF1.5;ofp-print ofpt_stats_request;
+251;ofp-print.at:2102;OFPST_PORT_DESC reply - OF1.0;ofp-print ofpt_stats_reply;
+252;ofp-print.at:2121;OFPST_PORT_DESC reply - OF1.4;ofp-print ofpt_stats_reply;
+253;ofp-print.at:2142;OFPT_METER_MOD request - OF1.3;ofp-print;
+254;ofp-print.at:2153;OFPT_METER_MOD request - bad band - OF1.3;ofp-print;
+255;ofp-print.at:2163;OFPT_METER_MOD request - bad command - OF1.3;ofp-print;
+256;ofp-print.at:2172;OFPT_METER_MOD request - bad flags - OF1.3;ofp-print;
+257;ofp-print.at:2182;OFPST_METER request - OF1.3;ofp-print ofpt_stats_request;
+258;ofp-print.at:2189;OFPST_METER_CONFIG request - OF1.3;ofp-print ofpt_stats_request;
+259;ofp-print.at:2196;OFPST_METER_FEATURES request - OF1.3;ofp-print ofpt_stats_request;
+260;ofp-print.at:2203;OFPST_METER_FEATURES reply - OF1.3;ofp-print ofpt_stats_reply;
+261;ofp-print.at:2216;OFPST_METER_CONFIG reply - OF1.3;ofp-print ofpt_stats_reply;
+262;ofp-print.at:2236;OFPST_METER reply - OF1.3;ofp-print ofpt_stats_reply;
+263;ofp-print.at:2260;OFPST_TABLE_FEATURES request - OF1.3;ofp-print ofpt_stats_request;
+264;ofp-print.at:2479;OFPT_BARRIER_REQUEST - OF1.0;ofp-print;
+265;ofp-print.at:2486;OFPT_BARRIER_REQUEST - OF1.1;ofp-print;
+266;ofp-print.at:2493;OFPT_BARRIER_REQUEST - OF1.2;ofp-print;
+267;ofp-print.at:2500;OFPT_BARRIER_REQUEST - OF1.3;ofp-print;
+268;ofp-print.at:2507;OFPT_BARRIER_REPLY - OF1.0;ofp-print;
+269;ofp-print.at:2514;OFPT_BARRIER_REPLY - OF1.1;ofp-print;
+270;ofp-print.at:2521;OFPT_BARRIER_REPLY - OF1.2;ofp-print;
+271;ofp-print.at:2528;OFPT_BARRIER_REPLY - OF1.3;ofp-print;
+272;ofp-print.at:2535;OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.0;ofp-print;
+273;ofp-print.at:2542;OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.2;ofp-print;
+274;ofp-print.at:2550;OFPT_QUEUE_GET_CONFIG_REPLY - OF1.0;ofp-print;
+275;ofp-print.at:2565;OFPT_QUEUE_GET_CONFIG_REPLY - OF1.2;ofp-print;
+276;ofp-print.at:2580;OFPT_SET_ASYNC - OF1.3;ofp-print;
+277;ofp-print.at:2599;OFPT_ROLE_REQUEST - OF1.2;ofp-print;
+278;ofp-print.at:2609;OFPT_ROLE_REQUEST - nochange - OF1.2;ofp-print;
+279;ofp-print.at:2619;NXT_ROLE_REQUEST;ofp-print;
+280;ofp-print.at:2629;OFPT_ROLE_REPLY - OF1.2;ofp-print;
+281;ofp-print.at:2639;NXT_ROLE_REPLY;ofp-print;
+282;ofp-print.at:2649;OFP_ROLE_STATUS - master, experimenter - OF1.4;ofp-print;
+283;ofp-print.at:2659;OFP_ROLE_STATUS - master, config - OF1.4;ofp-print;
+284;ofp-print.at:2669;OFP_ROLE_STATUS - master, config,generation - OF1.4;ofp-print;
+285;ofp-print.at:2679;NXT_SET_PACKET_IN;ofp-print;
+286;ofp-print.at:2689;NXT_PACKET_IN;ofp-print;
+287;ofp-print.at:2710;NXT_PACKET_IN, with hex output of packet data;ofp-print;
+288;ofp-print.at:2735;NXT_SET_ASYNC_CONFIG;ofp-print;
+289;ofp-print.at:2755;NXT_SET_CONTROLLER_ID;ofp-print;
+290;ofp-print.at:2765;NXT_FLOW_MONITOR_CANCEL;ofp-print;
+291;ofp-print.at:2775;NXT_FLOW_MONITOR_PAUSED;ofp-print;
+292;ofp-print.at:2784;NXT_FLOW_MONITOR_RESUMED;ofp-print;
+293;ofp-print.at:2793;NXT_SET_FLOW_FORMAT;ofp-print;
+294;ofp-print.at:2804;NXT_FLOW_MOD, low verbosity;ofp-print;
+295;ofp-print.at:2820;NXT_FLOW_MOD, high verbosity;ofp-print;
+296;ofp-print.at:2834;OFPT_GROUP_MOD - OF1.1;ofp-print;
+297;ofp-print.at:2850;OFPT_GROUP_MOD add - OF1.5;ofp-print;
+298;ofp-print.at:2871;OFPT_GROUP_MOD insert bucket - OF1.5;ofp-print;
+299;ofp-print.at:2889;NXT_FLOW_REMOVED;ofp-print;
+300;ofp-print.at:2905;NXT_FLOW_MOD_TABLE_ID;ofp-print;
+301;ofp-print.at:2915;NXST_FLOW request;ofp-print ofpt_stats_request;
+302;ofp-print.at:2925;NXST_FLOW reply;ofp-print ofpt_stats_reply;
+303;ofp-print.at:3079;NXST_AGGREGATE request;ofp-print ofpt_stats_request;
+304;ofp-print.at:3089;NXST_AGGREGATE reply;ofp-print ofpt_stats_reply;
+305;ofp-print.at:3100;NXST_FLOW_MONITOR request;ofp-print ofpt_stats_reply;
+306;ofp-print.at:3113;NXST_FLOW_MONITOR reply;ofp-print ofpt_stats_reply;
+307;ofp-print.at:3128;OFPT_BUNDLE_CONTROL - OPEN_REQUEST;ofp-print;
+308;ofp-print.at:3139;OFPT_BUNDLE_CONTROL - OPEN_REQUEST;ofp-print;
+309;ofp-print.at:3150;OFPT_BUNDLE_CONTROL - OPEN_REQUEST;ofp-print;
+310;ofp-print.at:3161;OFPT_BUNDLE_CONTROL - OPEN_REPLY;ofp-print;
+311;ofp-print.at:3172;OFPT_BUNDLE_CONTROL - CLOSE_REQUEST;ofp-print;
+312;ofp-print.at:3183;OFPT_BUNDLE_CONTROL - CLOSE_REPLY;ofp-print;
+313;ofp-print.at:3194;OFPT_BUNDLE_CONTROL - COMMIT_REQUEST;ofp-print;
+314;ofp-print.at:3205;OFPT_BUNDLE_CONTROL - COMMIT_REPLY;ofp-print;
+315;ofp-print.at:3216;OFPT_BUNDLE_CONTROL - DISCARD_REQUEST;ofp-print;
+316;ofp-print.at:3227;OFPT_BUNDLE_CONTROL - DISCARD_REPLY;ofp-print;
+317;ofp-print.at:3238;OFPT_BUNDLE_ADD_MESSAGE - verify xid;ofp-print;
+318;ofp-print.at:3248;OFPT_BUNDLE_ADD_MESSAGE - reject OFPT_HELLO;ofp-print;
+319;ofp-print.at:3258;OFPT_BUNDLE_ADD_MESSAGE - FLOW_MOD;ofp-print;
+320;ofp-print.at:3278;OFPT_BUNDLE_ADD_MESSAGE - PORT_MOD;ofp-print;
+321;ofp-util.at:3;encoding hellos;;
+322;ofp-errors.at:3;OFPT_ERROR with type OFPET_HELLO_FAILED - OF1.0;ofp-print ofp-errors;
+323;ofp-errors.at:11;OFPT_ERROR with type OFPET_HELLO_FAILED - OF1.1;ofp-print ofp-errors;
+324;ofp-errors.at:19;OFPT_ERROR with type OFPET_BAD_REQUEST - OF1.0;ofp-print ofp-errors;
+325;ofp-errors.at:29;OFPT_ERROR prints type of truncated inner messages;ofp-print ofp-errors;
+326;ofp-errors.at:46;OFPT_ERROR with code OFPBMC_BAD_PREREQ - OF1.0;ofp-print ofp-errors;
+327;ofp-errors.at:54;OFPT_ERROR with code OFPBMC_BAD_PREREQ - OF1.1;ofp-print ofp-errors;
+328;ofp-errors.at:64;OFPT_ERROR with type OFPFMFC_OVERLAP - OF1.0;ofp-print ofp-errors;
+329;ofp-errors.at:73;OFPT_ERROR with type OFPBIC_UNSUP_INST - OF1.1;ofp-print ofp-errors;
+330;ofp-errors.at:83;OFPT_ERROR with type OFPBIC_DUP_INST - OF1.4;ofp-print ofp-errors;
+331;ofp-errors.at:97;encoding OFPBIC_* experimenter errors;ofp-print ofp-errors;
+332;ofp-errors.at:117;encoding errors extension that became official;ofp-print ofp-errors;
+333;ofp-errors.at:136;decoding OFPBIC_* experimenter errors;ofp-print ofp-errors;
+334;ofp-errors.at:152;decoding experimenter errors;ofp-print ofp-errors;
+335;ofp-errors.at:184;encoding experimenter errors;ofp-print ofp-errors;
+336;ovs-ofctl.at:3;ovs-ofctl parse-flows choice of protocol;;
+337;ovs-ofctl.at:140;ovs-ofctl parse-flows (OpenFlow 1.0);;
+338;ovs-ofctl.at:177;ovs-ofctl parse-flows (OpenFlow 1.1);;
+339;ovs-ofctl.at:214;ovs-ofctl parse-flows (OpenFlow 1.2);;
+340;ovs-ofctl.at:259;ovs-ofctl parse-flow with invalid mask;;
+341;ovs-ofctl.at:298;ovs-ofctl action inconsistency (OpenFlow 1.1);;
+342;ovs-ofctl.at:304;ovs-ofctl parse-flows (With Tunnel-Parameters);;
+343;ovs-ofctl.at:316;ovs-ofctl parse-flows (skb_priority);;
+344;ovs-ofctl.at:328;ovs-ofctl parse-flows (NXM);;
+345;ovs-ofctl.at:399;ovs-ofctl -F nxm parse-flows;;
+346;ovs-ofctl.at:466;ovs-ofctl -F nxm -mmm parse-flows;;
+347;ovs-ofctl.at:531;ovs-ofctl parse-nx-match;nx-match;
+348;ovs-ofctl.at:1126;ovs-ofctl parse-ofp10-match;of1.0;
+349;ovs-ofctl.at:1341;ovs-ofctl parse-ofp11-match;of1.1;
+350;ovs-ofctl.at:1667;ovs-ofctl parse-nx-match loose;nx-match;
+351;ovs-ofctl.at:1688;ovs-ofctl parse-oxm (OpenFlow 1.2);oxm;
+352;ovs-ofctl.at:2182;ovs-ofctl parse-oxm (OpenFlow 1.3);oxm;
+353;ovs-ofctl.at:2205;ovs-ofctl parse-oxm (OpenFlow 1.5);oxm;
+354;ovs-ofctl.at:2270;ovs-ofctl parse-oxm loose;oxm;
+355;ovs-ofctl.at:2291;experimenter OXM encoding;;
+356;ovs-ofctl.at:2338;check TCP flags expression in OXM and NXM;;
+357;ovs-ofctl.at:2370;ovs-ofctl check-vlan;vlan;
+358;ovs-ofctl.at:2467;ovs-ofctl -F option and NXM features;;
+359;ovs-ofctl.at:2480;ovs-ofctl -F option with flow_mods;;
+360;ovs-ofctl.at:2492;ovs-ofctl dump-flows honors -F option;;
+361;ovs-ofctl.at:2504;ovs-ofctl dump-flows rejects bad -F option;;
+362;ovs-ofctl.at:2513;ovs-ofctl add-flow reports non-normalized flows;;
+363;ovs-ofctl.at:2527;ovs-ofctl dump-flows with sorting;sort;
+364;ovs-ofctl.at:2614;ovs-ofctl diff-flows;;
+365;ovs-ofctl.at:2646;ovs-ofctl diff-flows - suppress false differences;;
+366;ovs-ofctl.at:2663;ovs-ofctl -F and -O interaction;;
+367;ovs-ofctl.at:2684;ovs-ofctl ofp-parse;;
+368;ovs-ofctl.at:2702;tcp flags - filtering;;
+369;ovs-ofctl.at:2771;ovs-ofctl rule with importance;;
+370;ovs-ofctl.at:2798;ovs-ofctl replace-flows with importance;;
+371;ovs-ofctl.at:2817;ovs-ofctl replace-flows with --bundle;;
+372;odp.at:3;OVS datapath key parsing and formatting - valid forms;;
+373;odp.at:93;OVS datapath wildcarded key parsing and formatting - valid forms;;
+374;odp.at:167;OVS datapath wildcarded key filtering.;;
+375;odp.at:232;OVS datapath actions parsing and formatting - valid forms;;
+376;mpls-xlate.at:3;MPLS xlate action;;
+377;multipath.at:10;modulo_n multipath link selection;;
+378;multipath.at:78;hash_threshold multipath link selection;;
+379;multipath.at:146;hrw multipath link selection;;
+380;multipath.at:214;iter_hash multipath link selection;;
+381;multipath.at:282;multipath action missing argument;;
+382;multipath.at:288;multipath action bad fields;;
+383;multipath.at:294;multipath action bad algorithm;;
+384;multipath.at:300;multipath action bad n_links;;
+385;multipath.at:306;multipath action destination too narrow;;
+386;learn.at:3;learning action - parsing and formatting;;
+387;learn.at:24;learning action - parsing and formatting - illegal in_port_oxm;;
+388;learn.at:33;learning action - parsing and formatting - OXM;;
+389;learn.at:46;learning action - examples;;
+390;learn.at:64;learning action - satisfied prerequisites;;
+391;learn.at:79;learning action - invalid prerequisites;;
+392;learn.at:94;learning action - too-long immediate value;;
+393;learn.at:108;learning action - standard VLAN+MAC learning;;
+394;learn.at:177;learning action - learn refreshes hard_age;;
+395;learn.at:245;learning action - TCPv4 port learning;;
+396;learn.at:271;learning action - TCPv6 port learning;;
+397;learn.at:303;learning action - self-modifying flow;;
+398;learn.at:345;learning action - self-modifying flow with idle_timeout;;
+399;learn.at:403;learning action - self-modifying flow with hard_timeout;;
+400;learn.at:487;learning action - fin_timeout feature;;
+401;learn.at:502;learning action - delete_learned feature;;
+402;vconn.at:21;unix vconn - refuse connection;;
+403;vconn.at:21;unix vconn - accept then close;;
+404;vconn.at:21;unix vconn - read hello;;
+405;vconn.at:21;unix vconn - send plain hello;;
+406;vconn.at:21;unix vconn - send long hello;;
+407;vconn.at:21;unix vconn - send echo hello;;
+408;vconn.at:21;unix vconn - send short hello;;
+409;vconn.at:21;unix vconn - send invalid version hello;;
+410;vconn.at:22;tcp vconn - refuse connection;;
+411;vconn.at:22;tcp vconn - accept then close;;
+412;vconn.at:22;tcp vconn - read hello;;
+413;vconn.at:22;tcp vconn - send plain hello;;
+414;vconn.at:22;tcp vconn - send long hello;;
+415;vconn.at:22;tcp vconn - send echo hello;;
+416;vconn.at:22;tcp vconn - send short hello;;
+417;vconn.at:22;tcp vconn - send invalid version hello;;
+418;vconn.at:23;ssl vconn - refuse connection;;
+419;vconn.at:23;ssl vconn - accept then close;;
+420;vconn.at:23;ssl vconn - read hello;;
+421;vconn.at:23;ssl vconn - send plain hello;;
+422;vconn.at:23;ssl vconn - send long hello;;
+423;vconn.at:23;ssl vconn - send echo hello;;
+424;vconn.at:23;ssl vconn - send short hello;;
+425;vconn.at:23;ssl vconn - send invalid version hello;;
+426;file_name.at:13;components of \"/usr/lib\" are \"/usr\", \"lib\";dir_name base_name;
+427;file_name.at:14;components of \"/usr/\" are \"/\", \"usr\";dir_name base_name;
+428;file_name.at:15;components of \"usr\" are \".\", \"usr\";dir_name base_name;
+429;file_name.at:16;components of \"/\" are \"/\", \"/\";dir_name base_name;
+430;file_name.at:17;components of \".\" are \".\", \".\";dir_name base_name;
+431;file_name.at:18;components of \"..\" are \".\", \"..\";dir_name base_name;
+432;file_name.at:19;components of \"//\" are \"//\", \"//\";dir_name base_name;
+433;file_name.at:20;components of \"//foo\" are \"//\", \"foo\";dir_name base_name;
+434;file_name.at:21;components of \"\" are \".\", \".\";dir_name base_name;
+435;file_name.at:24;components of \"dir/file\" are \"dir\", \"file\";dir_name base_name;
+436;file_name.at:25;components of \"dir/file/\" are \"dir\", \"file\";dir_name base_name;
+437;file_name.at:26;components of \"dir/file//\" are \"dir\", \"file\";dir_name base_name;
+438;file_name.at:27;components of \"///foo\" are \"/\", \"foo\";dir_name base_name;
+439;file_name.at:37;follow_symlinks - relative symlinks;;
+440;file_name.at:54;follow_symlinks - absolute symlinks;;
+441;file_name.at:71;follow_symlinks - symlinks to directories;;
+442;file_name.at:84;follow_symlinks - nonexistent targets;;
+443;file_name.at:92;follow_symlinks - regular files;;
+444;file_name.at:97;follow_symlinks - device targets;;
+445;file_name.at:106;follow_symlinks - nonexistent files;;
+446;file_name.at:114;follow_symlinks - symlink loop;;
+447;aes128.at:10;wikipedia test vector 1;aes128;
+448;aes128.at:16;wikipedia test vector 2;aes128;
+449;aes128.at:22;NIST KAT ECBKeySbox128e vector 0;aes128;
+450;aes128.at:28;NIST KAT ECBKeySbox128e vector 1;aes128;
+451;aes128.at:34;NIST KAT ECBKeySbox128e vector 2;aes128;
+452;aes128.at:40;NIST KAT ECBKeySbox128e vector 3;aes128;
+453;aes128.at:46;NIST KAT ECBKeySbox128e vector 4;aes128;
+454;aes128.at:52;NIST KAT ECBKeySbox128e vector 5;aes128;
+455;aes128.at:58;NIST KAT ECBKeySbox128e vector 6;aes128;
+456;aes128.at:64;NIST KAT ECBKeySbox128e vector 7;aes128;
+457;aes128.at:70;NIST KAT ECBKeySbox128e vector 8;aes128;
+458;aes128.at:76;NIST KAT ECBKeySbox128e vector 9;aes128;
+459;aes128.at:82;NIST KAT ECBKeySbox128e vector 10;aes128;
+460;aes128.at:88;NIST KAT ECBKeySbox128e vector 11;aes128;
+461;aes128.at:94;NIST KAT ECBKeySbox128e vector 12;aes128;
+462;aes128.at:100;NIST KAT ECBKeySbox128e vector 13;aes128;
+463;aes128.at:106;NIST KAT ECBKeySbox128e vector 14;aes128;
+464;aes128.at:112;NIST KAT ECBKeySbox128e vector 15;aes128;
+465;aes128.at:118;NIST KAT ECBKeySbox128e vector 16;aes128;
+466;aes128.at:124;NIST KAT ECBKeySbox128e vector 17;aes128;
+467;aes128.at:130;NIST KAT ECBKeySbox128e vector 18;aes128;
+468;aes128.at:136;NIST KAT ECBKeySbox128e vector 19;aes128;
+469;aes128.at:142;NIST KAT ECBKeySbox128e vector 20;aes128;
+470;unixctl-py.at:6;unixctl ovs-vswitchd exit - Python;;
+471;unixctl-py.at:17;unixctl ovs-vswitchd list-commands - Python;;
+472;unixctl-py.at:32;unixctl ovs-vswitchd arguments - Python;;
+473;unixctl-py.at:74;unixctl bad target - Python;;
+474;unixctl-py.at:91;unixctl server - Python;;
+475;unixctl-py.at:165;unixctl server errors - Python;;
+476;uuid.at:15;UUID generation, parsing, serialization;uuid;
+477;json.at:65;empty array - C;json positive;
+478;json.at:65;empty array - Python;json positive python;
+479;json.at:66;single-element array - C;json positive;
+480;json.at:66;single-element array - Python;json positive python;
+481;json.at:67;2-element array - C;json positive;
+482;json.at:67;2-element array - Python;json positive python;
+483;json.at:68;many-element array - C;json positive;
+484;json.at:68;many-element array - Python;json positive python;
+485;json.at:71;missing comma - C;json negative;
+486;json.at:71;missing comma - Python;json negative python;
+487;json.at:73;trailing comma not allowed - C;json negative;
+488;json.at:73;trailing comma not allowed - Python;json negative python;
+489;json.at:75;doubled comma not allowed - C;json negative;
+490;json.at:75;doubled comma not allowed - Python;json negative python;
+491;json.at:80;empty string - C;json positive;
+492;json.at:80;empty string - Python;json positive python;
+493;json.at:81;1-character strings - C;json positive;
+494;json.at:81;1-character strings - Python;json positive python;
+495;json.at:84;escape sequences - C;json positive;
+496;json.at:84;escape sequences - Python;json positive python;
+497;json.at:87;Unicode escape sequences - C;json positive;
+498;json.at:87;Unicode escape sequences - Python;json positive python;
+499;json.at:90;surrogate pairs - C;json positive;
+500;json.at:93;surrogate pairs - Python;json positive python;
+501;json.at:96;a string by itself is not valid JSON - C;json negative;
+502;json.at:96;a string by itself is not valid JSON - Python;json negative python;
+503;json.at:98;end of line in quoted string - C;json negative;
+504;json.at:98;end of line in quoted string - Python;json negative python;
+505;json.at:102;formfeed in quoted string - C;json negative;
+506;json.at:102;formfeed in quoted string - Python;json negative python;
+507;json.at:105;bad escape in quoted string - C;json negative;
+508;json.at:105;bad escape in quoted string - Python;json negative python;
+509;json.at:108;\\u must be followed by 4 hex digits (1) - C;json negative;
+510;json.at:108;\\u must be followed by 4 hex digits (1) - Python;json negative python;
+511;json.at:111;\\u must be followed by 4 hex digits (2) - C;json negative;
+512;json.at:111;\\u must be followed by 4 hex digits (2) - Python;json negative python;
+513;json.at:114;isolated leading surrogate not allowed - C;json negative;
+514;json.at:114;isolated leading surrogate not allowed - Python;json negative python;
+515;json.at:117;surrogatess must paired properly - C;json negative;
+516;json.at:117;surrogatess must paired properly - Python;json negative python;
+517;json.at:120;null bytes not allowed - C;json negative;
+518;json.at:120;null bytes not allowed - Python;json negative python;
+519;json.at:124;properly quoted backslash at end of string - C;json positive;
+520;json.at:124;properly quoted backslash at end of string - Python;json positive python;
+521;json.at:127;stray backslash at end of string - C;json negative;
+522;json.at:127;stray backslash at end of string - Python;json negative python;
+523;json.at:131;end of input in quoted string - C;json negative;
+524;json.at:138;end of input in quoted string - Python;json negative python;
+525;json.at:149;empty object - C;json positive;
+526;json.at:149;empty object - Python;json positive python;
+527;json.at:150;simple object - C;json positive;
+528;json.at:150;simple object - Python;json positive python;
+529;json.at:153;bad value - C;json negative;
+530;json.at:153;bad value - Python;json negative python;
+531;json.at:155;missing colon - C;json negative;
+532;json.at:155;missing colon - Python;json negative python;
+533;json.at:157;missing comma - C;json negative;
+534;json.at:157;missing comma - Python;json negative python;
+535;json.at:159;trailing comma not allowed - C;json negative;
+536;json.at:159;trailing comma not allowed - Python;json negative python;
+537;json.at:162;doubled comma not allowed - C;json negative;
+538;json.at:162;doubled comma not allowed - Python;json negative python;
+539;json.at:165;names must be strings - C;json negative;
+540;json.at:165;names must be strings - Python;json negative python;
+541;json.at:171;null - C;json positive;
+542;json.at:171;null - Python;json positive python;
+543;json.at:172;false - C;json positive;
+544;json.at:172;false - Python;json positive python;
+545;json.at:173;true - C;json positive;
+546;json.at:173;true - Python;json positive python;
+547;json.at:174;a literal by itself is not valid JSON - C;json negative;
+548;json.at:174;a literal by itself is not valid JSON - Python;json negative python;
+549;json.at:176;nullify is invalid - C;json negative;
+550;json.at:176;nullify is invalid - Python;json negative python;
+551;json.at:178;nubs is invalid - C;json negative;
+552;json.at:178;nubs is invalid - Python;json negative python;
+553;json.at:180;xxx is invalid - C;json negative;
+554;json.at:180;xxx is invalid - Python;json negative python;
+555;json.at:185;integers expressed as reals - C;json positive;
+556;json.at:185;integers expressed as reals - Python;json positive python;
+557;json.at:195;large integers - C;json positive;
+558;json.at:195;large integers - Python;json positive python;
+559;json.at:199;large integers expressed as reals - C;json positive;
+560;json.at:199;large integers expressed as reals - Python;json positive python;
+561;json.at:207;large integers that overflow to reals - C;json positive;
+562;json.at:207;large integers that overflow to reals - Python;json positive python;
+563;json.at:212;negative zero - C;json positive;
+564;json.at:212;negative zero - Python;json positive python;
+565;json.at:217;reals - C;json positive;
+566;json.at:217;reals - Python;json positive python;
+567;json.at:221;scientific notation - C;json positive;
+568;json.at:221;scientific notation - Python;json positive python;
+569;json.at:228;+/- DBL_MAX - C;json positive;
+570;json.at:228;+/- DBL_MAX - Python;json positive python;
+571;json.at:233;negative reals - C;json positive;
+572;json.at:233;negative reals - Python;json positive python;
+573;json.at:237;negative scientific notation - C;json positive;
+574;json.at:237;negative scientific notation - Python;json positive python;
+575;json.at:241;1e-9999 underflows to 0 - C;json positive;
+576;json.at:241;1e-9999 underflows to 0 - Python;json positive python;
+577;json.at:245;a number by itself is not valid JSON - C;json negative;
+578;json.at:245;a number by itself is not valid JSON - Python;json negative python;
+579;json.at:247;leading zeros not allowed - C;json negative;
+580;json.at:247;leading zeros not allowed - Python;json negative python;
+581;json.at:251;1e9999 is too big - C;json negative;
+582;json.at:251;1e9999 is too big - Python;json negative python;
+583;json.at:255;exponent bigger than INT_MAX - C;json negative;
+584;json.at:255;exponent bigger than INT_MAX - Python;json negative python;
+585;json.at:259;decimal point must be followed by digit - C;json negative;
+586;json.at:259;decimal point must be followed by digit - Python;json negative python;
+587;json.at:263;exponent must contain at least one digit (1) - C;json negative;
+588;json.at:263;exponent must contain at least one digit (1) - Python;json negative python;
+589;json.at:267;exponent must contain at least one digit (2) - C;json negative;
+590;json.at:267;exponent must contain at least one digit (2) - Python;json negative python;
+591;json.at:271;exponent must contain at least one digit (3) - C;json negative;
+592;json.at:271;exponent must contain at least one digit (3) - Python;json negative python;
+593;json.at:278;RFC 4267 object example - C;json positive;
+594;json.at:278;RFC 4267 object example - Python;json positive python;
+595;json.at:294;RFC 4267 array example - C;json positive;
+596;json.at:294;RFC 4267 array example - Python;json positive python;
+597;json.at:321;trailing garbage - C;json negative;
+598;json.at:321;trailing garbage - Python;json negative python;
+599;json.at:323;formfeeds are not valid white space - C;json negative;
+600;json.at:323;formfeeds are not valid white space - Python;json negative python;
+601;json.at:325;';' is not a valid token - C;json negative;
+602;json.at:325;';' is not a valid token - Python;json negative python;
+603;json.at:327;arrays nesting too deep - C;json negative;
+604;json.at:327;arrays nesting too deep - Python;json negative python;
+605;json.at:331;objects nesting too deep - C;json negative;
+606;json.at:331;objects nesting too deep - Python;json negative python;
+607;json.at:336;input may not be empty;json negative;
+608;json.at:344;multiple adjacent objects - C;json positive;
+609;json.at:344;multiple adjacent objects - Python;json positive python;
+610;json.at:349;multiple space-separated objects - C;json positive;
+611;json.at:349;multiple space-separated objects - Python;json positive python;
+612;json.at:354;multiple objects on separate lines - C;json positive;
+613;json.at:354;multiple objects on separate lines - Python;json positive python;
+614;json.at:361;multiple objects and arrays - C;json positive;
+615;json.at:361;multiple objects and arrays - Python;json positive python;
+616;json.at:367;garbage between multiple objects - C;json negative;
+617;json.at:367;garbage between multiple objects - Python;json negative python;
+618;json.at:371;garbage after multiple objects - C;json negative;
+619;json.at:371;garbage after multiple objects - Python;json negative python;
+620;jsonrpc.at:3;JSON-RPC request and successful reply;;
+621;jsonrpc.at:15;JSON-RPC request and error reply;;
+622;jsonrpc.at:27;JSON-RPC notification;;
+623;jsonrpc-py.at:3;JSON-RPC request and successful reply - Python;;
+624;jsonrpc-py.at:16;JSON-RPC request and error reply - Python;;
+625;jsonrpc-py.at:29;JSON-RPC notification - Python;;
+626;tunnel.at:3;tunnel - input;;
+627;tunnel.at:65;tunnel - ECN decapsulation;;
+628;tunnel.at:112;tunnel - output;;
+629;tunnel.at:145;tunnel - ToS and TTL inheritance;;
+630;tunnel.at:184;tunnel - set_tunnel;;
+631;tunnel.at:219;tunnel - key;;
+632;tunnel.at:269;tunnel - key match;;
+633;tunnel.at:319;tunnel - Geneve;;
+634;tunnel.at:331;tunnel - VXLAN;;
+635;tunnel.at:343;tunnel - LISP;;
+636;tunnel.at:355;tunnel - different VXLAN UDP port;;
+637;tunnel.at:384;ofproto-dpif - set_field - tun_src/tun_dst/tun_id;;
+638;tunnel-push-pop.at:3;tunnel_push_pop - action;;
+639;lockfile.at:15;lock and unlock;lockfile;
+640;lockfile.at:17;lock and unlock twice;lockfile;
+641;lockfile.at:19;lock blocks same process;lockfile;
+642;lockfile.at:23;lock blocks same process twice;lockfile;
+643;lockfile.at:28;lock blocks other process;lockfile;
+644;lockfile.at:33;lock twice blocks other process;lockfile;
+645;lockfile.at:39;lock and unlock allows other process;lockfile;
+646;lockfile.at:41;lock multiple;lockfile;
+647;lockfile.at:45;lock symlink;lockfile;
+648;lockfile.at:52;lock symlink to dir;lockfile;
+649;reconnect.at:26;nothing happens if not enabled - C;reconnect;
+650;reconnect.at:26;nothing happens if not enabled - Python;reconnect;
+651;reconnect.at:37;quick connect, idle disconnect - C;reconnect;
+652;reconnect.at:37;quick connect, idle disconnect - Python;reconnect;
+653;reconnect.at:93;slow connect, idle disconnect - C;reconnect;
+654;reconnect.at:93;slow connect, idle disconnect - Python;reconnect;
+655;reconnect.at:163;connect backs off - C;reconnect;
+656;reconnect.at:163;connect backs off - Python;reconnect;
+657;reconnect.at:362;connections with no data preserve backoff - C;reconnect;
+658;reconnect.at:362;connections with no data preserve backoff - Python;reconnect;
+659;reconnect.at:526;brief connection preserves backoff - C;reconnect;
+660;reconnect.at:526;brief connection preserves backoff - Python;reconnect;
+661;reconnect.at:657;brief connection with data preserves backoff - C;reconnect;
+662;reconnect.at:657;brief connection with data preserves backoff - Python;reconnect;
+663;reconnect.at:818;long connection resets backoff - C;reconnect;
+664;reconnect.at:818;long connection resets backoff - Python;reconnect;
+665;reconnect.at:979;connection attempt fails quickly - C;reconnect;
+666;reconnect.at:979;connection attempt fails quickly - Python;reconnect;
+667;reconnect.at:1034;max-tries of 1 honored - C;reconnect;
+668;reconnect.at:1034;max-tries of 1 honored - Python;reconnect;
+669;reconnect.at:1094;max-tries of 0 honored - C;reconnect;
+670;reconnect.at:1094;max-tries of 0 honored - Python;reconnect;
+671;reconnect.at:1110;passive mode - C;reconnect;
+672;reconnect.at:1110;passive mode - Python;reconnect;
+673;ovs-vswitchd.at:7;ovs-vswitchd detaches correctly with empty db;;
+674;ovs-vswitchd.at:38;ovs-vswitchd -- stats-update-interval;;
+675;ovs-vswitchd.at:71;ovs-vswitchd -- start additional ovs-vswitchd process;;
+676;ovs-vswitchd.at:95;ovs-vswitchd -- switch over to another ovs-vswitchd process;;
+677;ovs-vswitchd.at:134;ovs-vswitchd -- invalid database path;;
+678;ovs-vswitchd.at:158;ovs-vswitchd - do not create sockets with unsafe names;;
+679;ofproto.at:3;ofproto - echo request;;
+680;ofproto.at:9;ofproto - handling messages with bad version;;
+681;ofproto.at:32;ofproto - feature request, config request;;
+682;ofproto.at:49;ofproto - set OpenFlow port number;;
+683;ofproto.at:82;ofproto - port stats - (OpenFlow 1.0);;
+684;ofproto.at:93;ofproto - port stats - (OpenFlow 1.2);;
+685;ofproto.at:104;ofproto - port stats - (OpenFlow 1.4);;
+686;ofproto.at:119;ofproto - port-desc stats (OpenFlow 1.0);;
+687;ofproto.at:134;ofproto - port-desc stats (OpenFlow 1.2);;
+688;ofproto.at:147;ofproto - port-desc stats (OpenFlow 1.5);;
+689;ofproto.at:183;ofproto - queue stats - (OpenFlow 1.0);;
+690;ofproto.at:200;ofproto - queue stats - (OpenFlow 1.2);;
+691;ofproto.at:217;ofproto - queue stats - (OpenFlow 1.4);;
+692;ofproto.at:236;ofproto - queue configuration - (OpenFlow 1.0);;
+693;ofproto.at:250;ofproto - queue configuration - (OpenFlow 1.2);;
+694;ofproto.at:267;ofproto - no group support (OpenFlow 1.0);;
+695;ofproto.at:286;ofproto - del group (OpenFlow 1.1);;
+696;ofproto.at:327;ofproto - add indirect group;;
+697;ofproto.at:343;ofproto - del group (OpenFlow 1.5);;
+698;ofproto.at:380;ofproto - del group deletes flows;;
+699;ofproto.at:421;ofproto - insert buckets;;
+700;ofproto.at:517;ofproto - remove buckets;;
+701;ofproto.at:573;ofproto - flow mod checks group availability;;
+702;ofproto.at:601;ofproto - group description;;
+703;ofproto.at:614;ofproto - group description;;
+704;ofproto.at:627;ofproto - group features;;
+705;ofproto.at:653;ofproto - group stats (OpenFlow 1.1);;
+706;ofproto.at:677;ofproto - group stats (OpenFlow 1.3);;
+707;ofproto.at:701;ofproto - group stats (OpenFlow 1.5);;
+708;ofproto.at:725;ofproto - group add then bridge delete (OpenFlow 1.3);;
+709;ofproto.at:736;ofproto - mod-port (OpenFlow 1.0);;
+710;ofproto.at:770;ofproto - mod-port (OpenFlow 1.2);;
+711;ofproto.at:801;ofproto - mod-port (OpenFlow 1.4);;
+712;ofproto.at:833;ofproto - basic flow_mod commands (NXM);;
+713;ofproto.at:855;ofproto - basic flow_mod commands (OpenFlow 1.0);;
+714;ofproto.at:877;ofproto - basic flow_mod commands (OpenFlow 1.1);;
+715;ofproto.at:900;ofproto - flow_mod negative test (OpenFlow 1.1);;
+716;ofproto.at:914;ofproto - set-field flow_mod commands (NXM);;
+717;ofproto.at:927;ofproto - basic flow_mod commands (OpenFlow 1.2);;
+718;ofproto.at:946;ofproto - set-field flow_mod commands (OF1.2);;
+719;ofproto.at:959;ofproto - dump flows with cookie;;
+720;ofproto.at:983;ofproto - mod flow with cookie change (OpenFlow 1.0);;
+721;ofproto.at:999;ofproto - mod flow with cookie change (NXM);;
+722;ofproto.at:1015;ofproto - no mod flow with cookie change (OpenFlow 1.1);;
+723;ofproto.at:1031;ofproto - no mod flow with cookie change (OpenFlow 1.2);;
+724;ofproto.at:1047;ofproto - mod flows based on cookie mask (OpenFlow 1.0);;
+725;ofproto.at:1069;ofproto - mod flows based on cookie mask (OpenFlow 1.1);;
+726;ofproto.at:1091;ofproto - mod flows based on cookie mask (OpenFlow 1.2);;
+727;ofproto.at:1114;ofproto - mod flows based on cookie mask with cookie change;;
+728;ofproto.at:1136;ofproto - mod flow with cookie miss (mask==0) - NXM;;
+729;ofproto.at:1146;ofproto - mod flow with cookie miss (mask==0) - OF1.1;;
+730;ofproto.at:1156;ofproto - mod flow with cookie miss (mask==0) - OF1.2;;
+731;ofproto.at:1165;ofproto - mod flow with cookie miss (mask!=0) - NXM;;
+732;ofproto.at:1174;ofproto - mod flow with cookie miss (mask!=0) - OF1.1;;
+733;ofproto.at:1183;ofproto - mod flow with cookie miss (mask!=0) - OF1.2;;
+734;ofproto.at:1192;ofproto - del flows with cookies;;
+735;ofproto.at:1211;ofproto - del flows based on cookie;;
+736;ofproto.at:1232;ofproto - del flows based on cookie mask;;
+737;ofproto.at:1251;ofproto - del flows based on table id (NXM);;
+738;ofproto.at:1283;ofproto - del flows based on table id (OpenFlow 1.1);;
+739;ofproto.at:1316;ofproto - del flows based on table id (OpenFlow 1.2);;
+740;ofproto.at:1348;ofproto - flow table configuration (OpenFlow 1.0);;
+741;ofproto.at:1398;ofproto - hidden rules not in table stats;;
+742;ofproto.at:1447;ofproto - flow table configuration (OpenFlow 1.2);;
+743;ofproto.at:1528;ofproto - table features (OpenFlow 1.3);;
+744;ofproto.at:1644;ofproto - hard limits on flow table size (OpenFlow 1.0);;
+745;ofproto.at:1688;ofproto - hard limits on flow table size (OpenFlow 1.2);;
+746;ofproto.at:1727;ofproto - eviction upon table overflow (OpenFlow 1.0);;
+747;ofproto.at:1785;ofproto - eviction upon table overflow (OpenFlow 1.2);;
+748;ofproto.at:1844;ofproto - eviction upon table overflow, with fairness (OpenFlow 1.0);;
+749;ofproto.at:1926;ofproto - eviction upon table overflow, with fairness (OpenFlow 1.2);;
+750;ofproto.at:2008;ofproto - eviction upon table overflow, with modified hard timeout;;
+751;ofproto.at:2052;ofproto - eviction upon table overflow, with modified idle timeout;;
+752;ofproto.at:2096;ofproto - asynchronous message control (OpenFlow 1.0);;
+753;ofproto.at:2199;ofproto - asynchronous message control (OpenFlow 1.2);;
+754;ofproto.at:2303;ofproto - asynchronous message control (OpenFlow 1.3);;
+755;ofproto.at:2412;ofproto - asynchronous message control (OpenFlow 1.5);;
+756;ofproto.at:2487;ofproto - controller role (OpenFlow 1.2);;
+757;ofproto.at:2552;ofproto - controller role (OpenFlow 1.4);;
+758;ofproto.at:2618;ofproto - packet-out from controller (OpenFlow 1.0);;
+759;ofproto.at:2654;ofproto - packet-out from controller (OpenFlow 1.2);;
+760;ofproto.at:2687;ofproto - packet-out from controller (OpenFlow 1.1);;
+761;ofproto.at:2718;ofproto - packet-out with metadata (NXM);;
+762;ofproto.at:2746;ofproto - packet-out with metadata (OpenFlow 1.2);;
+763;ofproto.at:2774;ofproto - packet-out with metadata and dual set_field (OpenFlow 1.3);;
+764;ofproto.at:2801;ofproto - packet-out with tunnel metadata (OpenFlow 1.2);;
+765;ofproto.at:2849;ofproto - flow monitoring;monitor;
+766;ofproto.at:2986;ofproto - flow monitoring with !own;monitor;
+767;ofproto.at:3027;ofproto - flow monitoring with out_port;monitor;
+768;ofproto.at:3079;ofproto - flow monitoring pause and resume;monitor;
+769;ofproto.at:3185;ofproto - event filtering (OpenFlow 1.3);monitor;
+770;ofproto.at:3219;ofproto - ofport_request;;
+771;ofproto.at:3275;ofproto - bundles, open (OpenFlow 1.4);monitor;
+772;ofproto.at:3299;ofproto - bundles, double open (OpenFlow 1.4);monitor;
+773;ofproto.at:3331;ofproto - bundle close without open (OpenFlow 1.4);monitor;
+774;ofproto.at:3355;ofproto - bundle double close (OpenFlow 1.4);monitor;
+775;ofproto.at:3394;ofproto - bundle close, different flags (OpenFlow 1.4);monitor;
+776;ofproto.at:3426;ofproto - bundle commit without open (OpenFlow 1.4);monitor;
+777;ofproto.at:3451;ofproto - bundle commit, different flags (OpenFlow 1.4);monitor;
+778;ofproto.at:3483;ofproto - bundle discard without open (OpenFlow 1.4);monitor;
+779;ofproto.at:3509;ofproto - bundle with multiple flow mods (OpenFlow 1.4);monitor;
+780;ofproto.at:3700;ofproto - failing bundle commit (OpenFlow 1.4);monitor;
+781;dpif-netdev.at:23;dpif-netdev - dummy interface;;
+782;dpif-netdev.at:57;dpif-netdev - miss upcall key matches flow_install;;
+783;dpif-netdev.at:92;dpif-netdev - miss upcall key matches flow_dump;;
+784;dpctl.at:3;dpctl - add-dp del-dp;;
+785;dpctl.at:19;dpctl - add-if set-if del-if;;
+786;ofproto-dpif.at:3;ofproto-dpif - revalidator/wait;;
+787;ofproto-dpif.at:9;ofproto-dpif - active-backup bonding;;
+788;ofproto-dpif.at:56;ofproto-dpif - balance-slb bonding;;
+789;ofproto-dpif.at:99;ofproto-dpif - balance-tcp bonding;;
+790;ofproto-dpif.at:152;ofproto-dpif - balance-tcp bonding, different recirc flow ;;
+791;ofproto-dpif.at:210;ofproto-dpif - resubmit;;
+792;ofproto-dpif.at:230;ofproto-dpif - goto table;;
+793;ofproto-dpif.at:244;ofproto-dpif - write actions;;
+794;ofproto-dpif.at:261;ofproto-dpif - modify IPv6 Neighbor Solitication (ND);;
+795;ofproto-dpif.at:280;ofproto-dpif - clear actions;;
+796;ofproto-dpif.at:296;ofproto-dpif - group chaining not supported;;
+797;ofproto-dpif.at:307;ofproto-dpif - all group in action list;;
+798;ofproto-dpif.at:322;ofproto-dpif - indirect group in action list;;
+799;ofproto-dpif.at:334;ofproto-dpif - group actions have no effect afterwards;;
+800;ofproto-dpif.at:346;ofproto-dpif - all group in action set;;
+801;ofproto-dpif.at:361;ofproto-dpif - indirect group in action set;;
+802;ofproto-dpif.at:373;ofproto-dpif - select group;;
+803;ofproto-dpif.at:393;ofproto-dpif - select group with watch port;;
+804;ofproto-dpif.at:405;ofproto-dpif - select group with weight;;
+805;ofproto-dpif.at:417;ofproto-dpif - select group with hash selection method;;
+806;ofproto-dpif.at:450;ofproto-dpif - fast failover group;;
+807;ofproto-dpif.at:462;ofproto-dpif - group stats single bucket;;
+808;ofproto-dpif.at:483;ofproto-dpif - group stats all buckets;;
+809;ofproto-dpif.at:504;ofproto-dpif - registers;;
+810;ofproto-dpif.at:541;ofproto-dpif - extended registers;;
+811;ofproto-dpif.at:560;ofproto-dpif - load and move order;;
+812;ofproto-dpif.at:574;ofproto-dpif - copy-field into extended registers;;
+813;ofproto-dpif.at:594;ofproto-dpif - masked set-field into metadata;;
+814;ofproto-dpif.at:616;ofproto-dpif - actset_output;;
+815;ofproto-dpif.at:656;ofproto-dpif - push-pop;;
+816;ofproto-dpif.at:675;ofproto-dpif - output;;
+817;ofproto-dpif.at:696;ofproto-dpif - dec_ttl;;
+818;ofproto-dpif.at:740;ofproto-dpif - dec_ttl without arguments at offset 32 in ofpacts;;
+819;ofproto-dpif.at:757;ofproto-dpif - dec_ttl with arguments at offset 32 in ofpacts;;
+820;ofproto-dpif.at:774;ofproto-dpif - note at offset 24 in ofpacts;;
+821;ofproto-dpif.at:784;ofproto-dpif - output, OFPP_NONE ingress port;;
+822;ofproto-dpif.at:802;ofproto-dpif - DSCP;;
+823;ofproto-dpif.at:829;ofproto-dpif - output/flood flags;;
+824;ofproto-dpif.at:887;ofproto-dpif - Default Table Miss - OF1.0 (OFPTC_TABLE_MISS_CONTROLLER);;
+825;ofproto-dpif.at:921;ofproto-dpif - Default Table Miss - OF1.3 (OFPTC_TABLE_MISS_DROP);;
+826;ofproto-dpif.at:949;ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_CONTROLLER;;
+827;ofproto-dpif.at:985;ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_CONTROLLER;;
+828;ofproto-dpif.at:1013;ofproto-dpif - Table Miss - OFPTC_TABLE_MISS_CONTINUE;;
+829;ofproto-dpif.at:1072;ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_CONTINUE;;
+830;ofproto-dpif.at:1136;ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_CONTINUE;;
+831;ofproto-dpif.at:1182;ofproto-dpif - Table Miss - OFPTC_TABLE_MISS_DROP;;
+832;ofproto-dpif.at:1210;ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_DROP;;
+833;ofproto-dpif.at:1241;ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_DROP;;
+834;ofproto-dpif.at:1272;ofproto-dpif - controller;;
+835;ofproto-dpif.at:1542;ofproto-dpif - MPLS handling;;
+836;ofproto-dpif.at:2592;ofproto-dpif - MPLS handling with goto_table;;
+837;ofproto-dpif.at:2640;ofproto-dpif - MPLS handling with write_actions;;
+838;ofproto-dpif.at:2688;ofproto-dpif - table-miss flow (OpenFlow 1.0);;
+839;ofproto-dpif.at:2728;ofproto-dpif - table-miss flow (OpenFlow 1.3);;
+840;ofproto-dpif.at:2769;ofproto-dpif - table-miss flow with async config (OpenFlow 1.3);;
+841;ofproto-dpif.at:2837;ofproto-dpif - table-miss flow (OpenFlow 1.4);;
+842;ofproto-dpif.at:2879;ofproto-dpif - packet-in reasons (Openflow 1.3);;
+843;ofproto-dpif.at:2947;ofproto-dpif - packet-in reasons (Openflow 1.4);;
+844;ofproto-dpif.at:3015;ofproto-dpif - ARP modification slow-path;;
+845;ofproto-dpif.at:3044;ofproto-dpif - VLAN handling;;
+846;ofproto-dpif.at:3178;ofproto-dpif - MPLS handling;;
+847;ofproto-dpif.at:3295;ofproto-dpif - VLAN+MPLS handling;;
+848;ofproto-dpif.at:3686;ofproto-dpif - fragment handling - trace;;
+849;ofproto-dpif.at:3735;ofproto-dpif - fragment handling - upcall;;
+850;ofproto-dpif.at:3810;ofproto-dpif - fragment handling - actions;;
+851;ofproto-dpif.at:3912;ofproto-dpif - exit;;
+852;ofproto-dpif.at:3937;ofproto-dpif - mirroring, select_all;;
+853;ofproto-dpif.at:3967;ofproto-dpif - mirroring, select_src;;
+854;ofproto-dpif.at:3995;ofproto-dpif - mirroring, OFPP_NONE ingress port;;
+855;ofproto-dpif.at:4016;ofproto-dpif - mirroring, select_dst;;
+856;ofproto-dpif.at:4046;ofproto-dpif - mirroring, select_vlan;;
+857;ofproto-dpif.at:4081;ofproto-dpif - mirroring, output_port;;
+858;ofproto-dpif.at:4110;ofproto-dpif - mirroring, output_vlan;;
+859;ofproto-dpif.at:4148;ofproto-dpif - ofproto/trace command 1;;
+860;ofproto-dpif.at:4289;ofproto-dpif - ofproto/trace command 2;;
+861;ofproto-dpif.at:4406;ofproto-dpif - ofproto/trace from dpctl output;;
+862;ofproto-dpif.at:4453;ofproto-dpif - ofproto/trace-packet-out;;
+863;ofproto-dpif.at:4483;ofproto-dpif - MAC learning;;
+864;ofproto-dpif.at:4572;ofproto-dpif - MAC table overflow;;
+865;ofproto-dpif.at:4632;ofproto-dpif - MAC table overflow fairness;;
+866;ofproto-dpif.at:5025;ofproto-dpif - sFlow packet sampling - IPv4 collector;;
+867;ofproto-dpif.at:5026;ofproto-dpif - sFlow packet sampling - IPv6 collector;;
+868;ofproto-dpif.at:5029;ofproto-dpif - sFlow LACP structures;;
+869;ofproto-dpif.at:5134;ofproto-dpif - NetFlow flow expiration - IPv4 collector;;
+870;ofproto-dpif.at:5135;ofproto-dpif - NetFlow flow expiration - IPv6 collector;;
+871;ofproto-dpif.at:5218;ofproto-dpif - NetFlow active expiration - IPv4 collector;;
+872;ofproto-dpif.at:5219;ofproto-dpif - NetFlow active expiration - IPv6 collector;;
+873;ofproto-dpif.at:5221;ofproto-dpif - flow stats;;
+874;ofproto-dpif.at:5242;ofproto-dpif - flow stats, set-n-threads;;
+875;ofproto-dpif.at:5265;ofproto-dpif - idle_age and hard_age increase over time;;
+876;ofproto-dpif.at:5355;ofproto-dpif - fin_timeout;;
+877;ofproto-dpif.at:5389;ofproto-dpif - ovs-appctl dpif/dump-dps;;
+878;ofproto-dpif.at:5401;ofproto-dpif - ovs-appctl dpif/show;;
+879;ofproto-dpif.at:5419;ofproto-dpif - ovs-appctl dpif/dump-flows;;
+880;ofproto-dpif.at:5452;ofproto-dpif - ovs-appctl dpif/get-flow;;
+881;ofproto-dpif.at:5471;ofproto-dpif - MPLS actions that result in a userspace action;;
+882;ofproto-dpif.at:5507;ofproto-dpif - MPLS actions that result in a drop;;
+883;ofproto-dpif.at:5545;ofproto-dpif - patch ports;;
+884;ofproto-dpif.at:5620;ofproto-dpif - patch ports - stack;;
+885;ofproto-dpif.at:5669;ofproto-dpif - port duration;;
+886;ofproto-dpif.at:5689;ofproto-dpif megaflow - port classification;;
+887;ofproto-dpif.at:5707;ofproto-dpif megaflow - L2 classification;;
+888;ofproto-dpif.at:5725;ofproto-dpif megaflow - L3 classification;;
+889;ofproto-dpif.at:5744;ofproto-dpif megaflow - IPv6 classification;;
+890;ofproto-dpif.at:5763;ofproto-dpif megaflow - L4 classification;;
+891;ofproto-dpif.at:5781;ofproto-dpif megaflow - normal;;
+892;ofproto-dpif.at:5796;ofproto-dpif megaflow - mpls;;
+893;ofproto-dpif.at:5845;ofproto-dpif megaflow - netflow - IPv4 collector;;
+894;ofproto-dpif.at:5846;ofproto-dpif megaflow - netflow - IPv6 collector;;
+895;ofproto-dpif.at:5848;ofproto-dpif megaflow - normal, active-backup bonding;;
+896;ofproto-dpif.at:5869;ofproto-dpif megaflow - normal, balance-slb bonding;;
+897;ofproto-dpif.at:5890;ofproto-dpif megaflow - normal, balance-tcp bonding;;
+898;ofproto-dpif.at:5928;ofproto-dpif megaflow - resubmit port action;;
+899;ofproto-dpif.at:5947;ofproto-dpif megaflow - resubmit table action;;
+900;ofproto-dpif.at:5967;ofproto-dpif megaflow - goto_table action;;
+901;ofproto-dpif.at:5986;ofproto-dpif megaflow - mirroring, select_all;;
+902;ofproto-dpif.at:6009;ofproto-dpif megaflow - mirroring, select_vlan;;
+903;ofproto-dpif.at:6032;ofproto-dpif megaflow - move action;;
+904;ofproto-dpif.at:6052;ofproto-dpif megaflow - push action;;
+905;ofproto-dpif.at:6070;ofproto-dpif megaflow - learning;;
+906;ofproto-dpif.at:6097;ofproto-dpif megaflow - tunnels;;
+907;ofproto-dpif.at:6130;ofproto-dpif megaflow - dec_ttl;;
+908;ofproto-dpif.at:6149;ofproto-dpif megaflow - set dl_dst;;
+909;ofproto-dpif.at:6170;ofproto-dpif megaflow - disabled;;
+910;ofproto-dpif.at:6203;ofproto-dpif - datapath port number change;;
+911;ofproto-dpif.at:6225;ofproto - bundle with variable bfd/cfm config;;
+912;ofproto-dpif.at:6303;ofproto-dpif - ofproto-dpif-monitor 1;;
+913;ofproto-dpif.at:6350;ofproto-dpif - ofproto-dpif-monitor 2;;
+914;ofproto-dpif.at:6363;ofproto-dpif - infinite resubmit;;
+915;ofproto-dpif.at:6376;ofproto-dpif - exponential resubmit chain;;
+916;ofproto-dpif.at:6391;ofproto-dpif - too many output actions;;
+917;ofproto-dpif.at:6409;ofproto-dpif - stack too deep;;
+918;ofproto-dpif.at:6426;ofproto-dpif packet-out controller;;
+919;ofproto-dpif.at:6471;ofproto-dpif packet-out controller (patch port);;
+920;ofproto-dpif.at:6528;ofproto-dpif packet-out goto_table;;
+921;ofproto-dpif.at:6584;ofproto-dpif packet-out table-miss (continue);;
+922;ofproto-dpif.at:6635;ofproto-dpif - ICMPv6;;
+923;ofproto-dpif.at:6655;ofproto-dpif - Neighbor Discovery set-field with checksum update;;
+924;ofproto-dpif.at:6677;ofproto-dpif - vlan matching;;
+925;ofproto-dpif.at:6693;ofproto-dpif - trace (unchanged);;
+926;bridge.at:7;bridge - ports that disappear get added back;;
+927;vlan-splinters.at:3;VLAN splinters;;
+928;ovsdb-log.at:3;create empty, reread;ovsdb log;
+929;ovsdb-log.at:18;write one, reread;ovsdb log;
+930;ovsdb-log.at:35;check that create fails if file exists;ovsdb log;
+931;ovsdb-log.at:55;write one, reread;ovsdb log;
+932;ovsdb-log.at:76;write one, reread, append;ovsdb log;
+933;ovsdb-log.at:106;write, reread one, overwrite;ovsdb log;
+934;ovsdb-log.at:132;write, add corrupted data, read;ovsdb log;
+935;ovsdb-log.at:154;write, add corrupted data, read, overwrite;ovsdb log;
+936;ovsdb-log.at:186;write, corrupt some data, read, overwrite;ovsdb log;
+937;ovsdb-log.at:219;write, truncate file, read, overwrite;ovsdb log;
+938;ovsdb-log.at:252;write bad JSON, read, overwrite;ovsdb log;
+939;ovsdb-types.at:3;integer - C;ovsdb positive;
+940;ovsdb-types.at:3;integer - Python;ovsdb positive python;
+941;ovsdb-types.at:5;real - C;ovsdb positive;
+942;ovsdb-types.at:5;real - Python;ovsdb positive python;
+943;ovsdb-types.at:7;boolean - C;ovsdb positive;
+944;ovsdb-types.at:7;boolean - Python;ovsdb positive python;
+945;ovsdb-types.at:9;string - C;ovsdb positive;
+946;ovsdb-types.at:9;string - Python;ovsdb positive python;
+947;ovsdb-types.at:11;uuid - C;ovsdb positive;
+948;ovsdb-types.at:11;uuid - Python;ovsdb positive python;
+949;ovsdb-types.at:13;void is not a valid atomic-type - C;ovsdb negative;
+950;ovsdb-types.at:13;void is not a valid atomic-type - Python;ovsdb negative;
+951;ovsdb-types.at:18;integer enum - C;ovsdb positive;
+952;ovsdb-types.at:18;integer enum - Python;ovsdb positive python;
+953;ovsdb-types.at:21;integer >= 5 - C;ovsdb positive;
+954;ovsdb-types.at:21;integer >= 5 - Python;ovsdb positive python;
+955;ovsdb-types.at:24;integer <= 7 - C;ovsdb positive;
+956;ovsdb-types.at:24;integer <= 7 - Python;ovsdb positive python;
+957;ovsdb-types.at:27;integer between -5 and 10 - C;ovsdb positive;
+958;ovsdb-types.at:27;integer between -5 and 10 - Python;ovsdb positive python;
+959;ovsdb-types.at:30;integer max may not be less than min - C;ovsdb negative;
+960;ovsdb-types.at:30;integer max may not be less than min - Python;ovsdb negative;
+961;ovsdb-types.at:34;real enum - C;ovsdb positive;
+962;ovsdb-types.at:34;real enum - Python;ovsdb positive python;
+963;ovsdb-types.at:37;real >= -1.5 - C;ovsdb positive;
+964;ovsdb-types.at:37;real >= -1.5 - Python;ovsdb positive python;
+965;ovsdb-types.at:40;real <= 1e5 - C;ovsdb positive;
+966;ovsdb-types.at:40;real <= 1e5 - Python;ovsdb positive python;
+967;ovsdb-types.at:43;real between -2.5 and 3.75 - C;ovsdb positive;
+968;ovsdb-types.at:43;real between -2.5 and 3.75 - Python;ovsdb positive python;
+969;ovsdb-types.at:46;real max may not be less than min - C;ovsdb negative;
+970;ovsdb-types.at:46;real max may not be less than min - Python;ovsdb negative;
+971;ovsdb-types.at:50;boolean - C;ovsdb positive;
+972;ovsdb-types.at:50;boolean - Python;ovsdb positive python;
+973;ovsdb-types.at:52;boolean enum - C;ovsdb positive;
+974;ovsdb-types.at:52;boolean enum - Python;ovsdb positive python;
+975;ovsdb-types.at:56;string enum - C;ovsdb positive;
+976;ovsdb-types.at:56;string enum - Python;ovsdb positive python;
+977;ovsdb-types.at:59;string minLength - C;ovsdb positive;
+978;ovsdb-types.at:59;string minLength - Python;ovsdb positive python;
+979;ovsdb-types.at:62;string maxLength - C;ovsdb positive;
+980;ovsdb-types.at:62;string maxLength - Python;ovsdb positive python;
+981;ovsdb-types.at:65;string minLength and maxLength - C;ovsdb positive;
+982;ovsdb-types.at:65;string minLength and maxLength - Python;ovsdb positive python;
+983;ovsdb-types.at:68;maxLength must not be less than minLength - C;ovsdb negative;
+984;ovsdb-types.at:68;maxLength must not be less than minLength - Python;ovsdb negative;
+985;ovsdb-types.at:71;maxLength must not be negative - C;ovsdb negative;
+986;ovsdb-types.at:71;maxLength must not be negative - Python;ovsdb negative;
+987;ovsdb-types.at:75;uuid enum - C;ovsdb positive;
+988;ovsdb-types.at:75;uuid enum - Python;ovsdb positive python;
+989;ovsdb-types.at:78;uuid refTable - C;ovsdb positive;
+990;ovsdb-types.at:78;uuid refTable - Python;ovsdb positive python;
+991;ovsdb-types.at:81;uuid refTable must be valid id - C;ovsdb negative;
+992;ovsdb-types.at:81;uuid refTable must be valid id - Python;ovsdb negative;
+993;ovsdb-types.at:85;void is not a valid base-type - C;ovsdb negative;
+994;ovsdb-types.at:85;void is not a valid base-type - Python;ovsdb negative;
+995;ovsdb-types.at:87;\"type\" member must be present - C;ovsdb negative;
+996;ovsdb-types.at:87;\"type\" member must be present - Python;ovsdb negative;
+997;ovsdb-types.at:92;simple integer - C;ovsdb positive;
+998;ovsdb-types.at:92;simple integer - Python;ovsdb positive python;
+999;ovsdb-types.at:94;simple real - C;ovsdb positive;
+1000;ovsdb-types.at:94;simple real - Python;ovsdb positive python;
+1001;ovsdb-types.at:96;simple boolean - C;ovsdb positive;
+1002;ovsdb-types.at:96;simple boolean - Python;ovsdb positive python;
+1003;ovsdb-types.at:98;simple string - C;ovsdb positive;
+1004;ovsdb-types.at:98;simple string - Python;ovsdb positive python;
+1005;ovsdb-types.at:100;simple uuid - C;ovsdb positive;
+1006;ovsdb-types.at:100;simple uuid - Python;ovsdb positive python;
+1007;ovsdb-types.at:102;integer in object - C;ovsdb positive;
+1008;ovsdb-types.at:102;integer in object - Python;ovsdb positive python;
+1009;ovsdb-types.at:104;real in object with explicit min and max - C;ovsdb positive;
+1010;ovsdb-types.at:104;real in object with explicit min and max - Python;ovsdb positive python;
+1011;ovsdb-types.at:107;key type is required - C;ovsdb negative;
+1012;ovsdb-types.at:107;key type is required - Python;ovsdb negative;
+1013;ovsdb-types.at:109;void is not a valid type - C;ovsdb negative;
+1014;ovsdb-types.at:109;void is not a valid type - Python;ovsdb negative;
+1015;ovsdb-types.at:114;optional boolean - C;ovsdb positive set;
+1016;ovsdb-types.at:114;optional boolean - Python;ovsdb positive python set;
+1017;ovsdb-types.at:118;set of 1 to 3 uuids - C;ovsdb positive;
+1018;ovsdb-types.at:118;set of 1 to 3 uuids - Python;ovsdb positive python;
+1019;ovsdb-types.at:121;set of 0 to 3 strings - C;ovsdb positive;
+1020;ovsdb-types.at:121;set of 0 to 3 strings - Python;ovsdb positive python;
+1021;ovsdb-types.at:124;set of 0 or more integers - C;ovsdb positive;
+1022;ovsdb-types.at:124;set of 0 or more integers - Python;ovsdb positive python;
+1023;ovsdb-types.at:127;set of 1 or more reals - C;ovsdb positive;
+1024;ovsdb-types.at:127;set of 1 or more reals - Python;ovsdb positive python;
+1025;ovsdb-types.at:131;set max cannot be less than min - C;ovsdb negative;
+1026;ovsdb-types.at:131;set max cannot be less than min - Python;ovsdb negative;
+1027;ovsdb-types.at:134;set max cannot be negative - C;ovsdb negative;
+1028;ovsdb-types.at:134;set max cannot be negative - Python;ovsdb negative;
+1029;ovsdb-types.at:137;set min cannot be negative - C;ovsdb negative;
+1030;ovsdb-types.at:137;set min cannot be negative - Python;ovsdb negative;
+1031;ovsdb-types.at:140;set min cannot be greater than one - C;ovsdb negative;
+1032;ovsdb-types.at:140;set min cannot be greater than one - Python;ovsdb negative;
+1033;ovsdb-types.at:146;map of 1 integer to boolean - C;ovsdb positive;
+1034;ovsdb-types.at:146;map of 1 integer to boolean - Python;ovsdb positive python;
+1035;ovsdb-types.at:149;map of 1 boolean to integer, explicit min and max - C;ovsdb positive;
+1036;ovsdb-types.at:149;map of 1 boolean to integer, explicit min and max - Python;ovsdb positive python;
+1037;ovsdb-types.at:152;map of 1 to 5 uuid to real - C;ovsdb positive;
+1038;ovsdb-types.at:152;map of 1 to 5 uuid to real - Python;ovsdb positive python;
+1039;ovsdb-types.at:155;map of 0 to 10 string to uuid - C;ovsdb positive;
+1040;ovsdb-types.at:155;map of 0 to 10 string to uuid - Python;ovsdb positive python;
+1041;ovsdb-types.at:158;map of 1 to 20 real to string - C;ovsdb positive;
+1042;ovsdb-types.at:158;map of 1 to 20 real to string - Python;ovsdb positive python;
+1043;ovsdb-types.at:161;map of 0 or more string to real - C;ovsdb positive;
+1044;ovsdb-types.at:161;map of 0 or more string to real - Python;ovsdb positive python;
+1045;ovsdb-types.at:165;map key type is required - C;ovsdb negative;
+1046;ovsdb-types.at:165;map key type is required - Python;ovsdb negative;
+1047;ovsdb-data.at:3;default atoms - C;ovsdb positive;
+1048;ovsdb-data.at:3;default atoms - Python;ovsdb positive python;
+1049;ovsdb-data.at:11;default data - C;ovsdb positive;
+1050;ovsdb-data.at:11;default data - Python;ovsdb positive python;
+1051;ovsdb-data.at:76;integer atom from JSON - C;ovsdb positive;
+1052;ovsdb-data.at:76;integer atom from JSON - Python;ovsdb positive python;
+1053;ovsdb-data.at:89;integer atom from string;ovsdb positive;
+1054;ovsdb-data.at:102;real atom from JSON - C;ovsdb positive;
+1055;ovsdb-data.at:102;real atom from JSON - Python;ovsdb positive python;
+1056;ovsdb-data.at:119;real atom from string;ovsdb positive;
+1057;ovsdb-data.at:136;boolean atom from JSON - C;ovsdb positive;
+1058;ovsdb-data.at:136;boolean atom from JSON - Python;ovsdb positive python;
+1059;ovsdb-data.at:141;boolean atom from string;ovsdb positive;
+1060;ovsdb-data.at:146;string atom from JSON - C;ovsdb positive;
+1061;ovsdb-data.at:146;string atom from JSON - Python;ovsdb positive python;
+1062;ovsdb-data.at:152;string atom from string;ovsdb positive;
+1063;ovsdb-data.at:167;uuid atom from JSON - C;ovsdb positive;
+1064;ovsdb-data.at:167;uuid atom from JSON - Python;ovsdb positive python;
+1065;ovsdb-data.at:171;uuid atom from string;ovsdb positive;
+1066;ovsdb-data.at:175;integer atom sorting - C;ovsdb positive;
+1067;ovsdb-data.at:175;integer atom sorting - Python;ovsdb positive python;
+1068;ovsdb-data.at:179;real atom sorting - C;ovsdb positive;
+1069;ovsdb-data.at:179;real atom sorting - Python;ovsdb positive python;
+1070;ovsdb-data.at:183;boolean atom sorting - C;ovsdb positive;
+1071;ovsdb-data.at:183;boolean atom sorting - Python;ovsdb positive python;
+1072;ovsdb-data.at:187;string atom sorting - C;ovsdb positive;
+1073;ovsdb-data.at:187;string atom sorting - Python;ovsdb positive python;
+1074;ovsdb-data.at:191;uuid atom sorting - C;ovsdb positive;
+1075;ovsdb-data.at:191;uuid atom sorting - Python;ovsdb positive python;
+1076;ovsdb-data.at:228;real not acceptable integer JSON atom - C;ovsdb positive;
+1077;ovsdb-data.at:228;real not acceptable integer JSON atom - Python;ovsdb positive python;
+1078;ovsdb-data.at:234;no invalid UTF-8 sequences in strings;ovsdb positive;
+1079;ovsdb-data.at:249;no invalid UTF-8 sequences in strings - Python;ovsdb positive python;
+1080;ovsdb-data.at:257;real not acceptable integer string atom;ovsdb negative;
+1081;ovsdb-data.at:261;string \"true\" not acceptable boolean JSON atom - C;ovsdb positive;
+1082;ovsdb-data.at:261;string \"true\" not acceptable boolean JSON atom - Python;ovsdb positive python;
+1083;ovsdb-data.at:265;string \"true\" not acceptable boolean string atom;ovsdb negative;
+1084;ovsdb-data.at:269;integer not acceptable string JSON atom - C;ovsdb positive;
+1085;ovsdb-data.at:269;integer not acceptable string JSON atom - Python;ovsdb positive python;
+1086;ovsdb-data.at:273;uuid atom must be expressed as JSON array - C;ovsdb positive;
+1087;ovsdb-data.at:273;uuid atom must be expressed as JSON array - Python;ovsdb positive python;
+1088;ovsdb-data.at:277;named-uuid requires symbol table - C;ovsdb positive;
+1089;ovsdb-data.at:277;named-uuid requires symbol table - Python;ovsdb positive python;
+1090;ovsdb-data.at:281;empty string atom must be quoted;ovsdb negative;
+1091;ovsdb-data.at:285;quotes must be balanced;ovsdb negative;
+1092;ovsdb-data.at:289;quoted string must not contain unescaped quote;ovsdb negative;
+1093;ovsdb-data.at:293;quoted string must not end with backslash;ovsdb negative;
+1094;ovsdb-data.at:297;uuids must be valid;ovsdb negative;
+1095;ovsdb-data.at:303;integer atom enum - C;ovsdb positive;
+1096;ovsdb-data.at:303;integer atom enum - Python;ovsdb positive python;
+1097;ovsdb-data.at:326;real atom enum - C;ovsdb positive;
+1098;ovsdb-data.at:326;real atom enum - Python;ovsdb positive python;
+1099;ovsdb-data.at:343;boolean atom enum - C;ovsdb positive;
+1100;ovsdb-data.at:343;boolean atom enum - Python;ovsdb positive python;
+1101;ovsdb-data.at:350;string atom enum - C;ovsdb positive;
+1102;ovsdb-data.at:350;string atom enum - Python;ovsdb positive python;
+1103;ovsdb-data.at:365;uuid atom enum - C;ovsdb positive;
+1104;ovsdb-data.at:365;uuid atom enum - Python;ovsdb positive python;
+1105;ovsdb-data.at:376;integers >= 5 - C;ovsdb positive;
+1106;ovsdb-data.at:376;integers >= 5 - Python;ovsdb positive python;
+1107;ovsdb-data.at:389;integers <= -1 - C;ovsdb positive;
+1108;ovsdb-data.at:389;integers <= -1 - Python;ovsdb positive python;
+1109;ovsdb-data.at:400;integers in range -10 to 10 - C;ovsdb positive;
+1110;ovsdb-data.at:400;integers in range -10 to 10 - Python;ovsdb positive python;
+1111;ovsdb-data.at:421;reals >= 5 - C;ovsdb positive;
+1112;ovsdb-data.at:421;reals >= 5 - Python;ovsdb positive python;
+1113;ovsdb-data.at:434;reals <= -1 - C;ovsdb positive;
+1114;ovsdb-data.at:434;reals <= -1 - Python;ovsdb positive python;
+1115;ovsdb-data.at:445;reals in range -10 to 10 - C;ovsdb positive;
+1116;ovsdb-data.at:445;reals in range -10 to 10 - Python;ovsdb positive python;
+1117;ovsdb-data.at:466;strings at least 2 characters long - C;ovsdb positive;
+1118;ovsdb-data.at:466;strings at least 2 characters long - Python;ovsdb positive python;
+1119;ovsdb-data.at:484;strings no more than 2 characters long - C;ovsdb positive;
+1120;ovsdb-data.at:484;strings no more than 2 characters long - Python;ovsdb positive python;
+1121;ovsdb-data.at:499;integer JSON datum - C;ovsdb positive;
+1122;ovsdb-data.at:499;integer JSON datum - Python;ovsdb positive python;
+1123;ovsdb-data.at:505;integer string datum;ovsdb positive;
+1124;ovsdb-data.at:512;real JSON datum - C;ovsdb positive;
+1125;ovsdb-data.at:512;real JSON datum - Python;ovsdb positive python;
+1126;ovsdb-data.at:518;real string datum;ovsdb positive;
+1127;ovsdb-data.at:524;boolean JSON datum - C;ovsdb positive;
+1128;ovsdb-data.at:524;boolean JSON datum - Python;ovsdb positive python;
+1129;ovsdb-data.at:529;boolean string datum;ovsdb positive;
+1130;ovsdb-data.at:534;string JSON datum - C;ovsdb positive;
+1131;ovsdb-data.at:534;string JSON datum - Python;ovsdb positive python;
+1132;ovsdb-data.at:540;string string datum;ovsdb positive;
+1133;ovsdb-data.at:549;JSON optional boolean - C;ovsdb positive set;
+1134;ovsdb-data.at:549;JSON optional boolean - Python;ovsdb positive python set;
+1135;ovsdb-data.at:559;string optional boolean;ovsdb positive set;
+1136;ovsdb-data.at:569;JSON set of 0 or more integers - C;ovsdb positive;
+1137;ovsdb-data.at:569;JSON set of 0 or more integers - Python;ovsdb positive python;
+1138;ovsdb-data.at:586;string set of 0 or more integers;ovsdb positive;
+1139;ovsdb-data.at:601;JSON set of 1 to 3 uuids - C;ovsdb positive;
+1140;ovsdb-data.at:601;JSON set of 1 to 3 uuids - Python;ovsdb positive python;
+1141;ovsdb-data.at:612;string set of 1 to 3 uuids;ovsdb positive;
+1142;ovsdb-data.at:621;JSON set of 0 to 3 strings - C;ovsdb positive;
+1143;ovsdb-data.at:621;JSON set of 0 to 3 strings - Python;ovsdb positive python;
+1144;ovsdb-data.at:634;string set of 0 to 3 strings;ovsdb positive;
+1145;ovsdb-data.at:645;duplicate boolean not allowed in JSON set - C;ovsdb negative;
+1146;ovsdb-data.at:645;duplicate boolean not allowed in JSON set - Python;ovsdb negative;
+1147;ovsdb-data.at:649;duplicate boolean not allowed in string set;ovsdb negative;
+1148;ovsdb-data.at:653;duplicate integer not allowed in JSON set - C;ovsdb negative;
+1149;ovsdb-data.at:653;duplicate integer not allowed in JSON set - Python;ovsdb negative;
+1150;ovsdb-data.at:657;duplicate integer not allowed in string set;ovsdb negative;
+1151;ovsdb-data.at:661;duplicate real not allowed in JSON set - C;ovsdb negative;
+1152;ovsdb-data.at:661;duplicate real not allowed in JSON set - Python;ovsdb negative;
+1153;ovsdb-data.at:665;duplicate real not allowed in string set;ovsdb negative;
+1154;ovsdb-data.at:669;duplicate string not allowed in JSON set - C;ovsdb negative;
+1155;ovsdb-data.at:669;duplicate string not allowed in JSON set - Python;ovsdb negative;
+1156;ovsdb-data.at:673;duplicate string not allowed in string set;ovsdb negative;
+1157;ovsdb-data.at:677;duplicate uuid not allowed in JSON set - C;ovsdb negative;
+1158;ovsdb-data.at:677;duplicate uuid not allowed in JSON set - Python;ovsdb negative;
+1159;ovsdb-data.at:684;duplicate uuid not allowed in string set;ovsdb negative;
+1160;ovsdb-data.at:693;JSON map of 1 integer to boolean - C;ovsdb positive;
+1161;ovsdb-data.at:693;JSON map of 1 integer to boolean - Python;ovsdb positive python;
+1162;ovsdb-data.at:698;string map of 1 integer to boolean;ovsdb positive;
+1163;ovsdb-data.at:703;JSON map of at least 1 integer to boolean - C;ovsdb positive;
+1164;ovsdb-data.at:703;JSON map of at least 1 integer to boolean - Python;ovsdb positive python;
+1165;ovsdb-data.at:712;string map of at least 1 integer to boolean;ovsdb positive;
+1166;ovsdb-data.at:721;JSON map of 1 boolean to integer - C;ovsdb positive;
+1167;ovsdb-data.at:721;JSON map of 1 boolean to integer - Python;ovsdb positive python;
+1168;ovsdb-data.at:726;string map of 1 boolean to integer;ovsdb positive;
+1169;ovsdb-data.at:731;JSON map of 1 uuid to real - C;ovsdb positive;
+1170;ovsdb-data.at:731;JSON map of 1 uuid to real - Python;ovsdb positive python;
+1171;ovsdb-data.at:740;string map of 1 uuid to real;ovsdb positive;
+1172;ovsdb-data.at:749;JSON map of 10 string to string - C;ovsdb positive;
+1173;ovsdb-data.at:749;JSON map of 10 string to string - Python;ovsdb positive python;
+1174;ovsdb-data.at:763;string map of 10 string to string;ovsdb positive;
+1175;ovsdb-data.at:777;duplicate integer key not allowed in JSON map - C;ovsdb negative;
+1176;ovsdb-data.at:777;duplicate integer key not allowed in JSON map - Python;ovsdb negative;
+1177;ovsdb-data.at:782;duplicate integer key not allowed in string map;ovsdb negative;
+1178;ovsdb-column.at:3;ordinary column - C;ovsdb positive;
+1179;ovsdb-column.at:3;ordinary column - Python;ovsdb positive python;
+1180;ovsdb-column.at:7;immutable column - C;ovsdb positive;
+1181;ovsdb-column.at:7;immutable column - Python;ovsdb positive python;
+1182;ovsdb-column.at:11;ephemeral column - C;ovsdb positive;
+1183;ovsdb-column.at:11;ephemeral column - Python;ovsdb positive python;
+1184;ovsdb-table.at:3;non-root table with one column - C;ovsdb positive;
+1185;ovsdb-table.at:3;non-root table with one column - Python;ovsdb positive python;
+1186;ovsdb-table.at:7;immutable table with one column - C;ovsdb positive;
+1187;ovsdb-table.at:7;immutable table with one column - Python;ovsdb positive python;
+1188;ovsdb-table.at:13;root table with one column - C;ovsdb positive;
+1189;ovsdb-table.at:13;root table with one column - Python;ovsdb positive python;
+1190;ovsdb-table.at:19;non-root table with default_is_root=true - C;ovsdb positive;
+1191;ovsdb-table.at:19;non-root table with default_is_root=true - Python;ovsdb positive python;
+1192;ovsdb-table.at:23;root table with default_is_root=true - C;ovsdb positive;
+1193;ovsdb-table.at:23;root table with default_is_root=true - Python;ovsdb positive python;
+1194;ovsdb-table.at:29;table with maxRows of 2 - C;ovsdb positive;
+1195;ovsdb-table.at:29;table with maxRows of 2 - Python;ovsdb positive python;
+1196;ovsdb-table.at:34;table with index - C;ovsdb positive;
+1197;ovsdb-table.at:34;table with index - Python;ovsdb positive python;
+1198;ovsdb-table.at:40;table with syntax error in index - C;ovsdb negative;
+1199;ovsdb-table.at:40;table with syntax error in index - Python;ovsdb negative;
+1200;ovsdb-table.at:46;table with empty index - C;ovsdb negative;
+1201;ovsdb-table.at:46;table with empty index - Python;ovsdb negative;
+1202;ovsdb-table.at:52;table with index of ephemeral column - C;ovsdb negative;
+1203;ovsdb-table.at:52;table with index of ephemeral column - Python;ovsdb negative;
+1204;ovsdb-table.at:59;column names may not begin with _ - C;ovsdb negative table;
+1205;ovsdb-table.at:59;column names may not begin with _ - Python;ovsdb negative table;
+1206;ovsdb-table.at:65;table must have at least one column (1) - C;ovsdb negative;
+1207;ovsdb-table.at:65;table must have at least one column (1) - Python;ovsdb negative;
+1208;ovsdb-table.at:69;table must have at least one column (2) - C;ovsdb negative;
+1209;ovsdb-table.at:69;table must have at least one column (2) - Python;ovsdb negative;
+1210;ovsdb-table.at:73;table maxRows must be positive - C;ovsdb negative;
+1211;ovsdb-table.at:73;table maxRows must be positive - Python;ovsdb negative;
+1212;ovsdb-row.at:3;row with one string column;ovsdb positive;
+1213;ovsdb-row.at:19;row with one integer column;ovsdb positive;
+1214;ovsdb-row.at:35;row with one real column;ovsdb positive;
+1215;ovsdb-row.at:51;row with one boolean column;ovsdb positive;
+1216;ovsdb-row.at:64;row with one uuid column;ovsdb positive;
+1217;ovsdb-row.at:77;row with set of 1 to 2 elements;ovsdb positive;
+1218;ovsdb-row.at:84;row with map of 1 to 2 elements;ovsdb positive;
+1219;ovsdb-row.at:91;row with several columns;ovsdb positive;
+1220;ovsdb-row.at:113;row hashing (scalars);ovsdb positive;
+1221;ovsdb-row.at:182;row hashing (sets);ovsdb positive;
+1222;ovsdb-row.at:235;row hashing (maps);ovsdb positive;
+1223;ovsdb-schema.at:3;schema with valid refTables - C;ovsdb positive;
+1224;ovsdb-schema.at:3;schema with valid refTables - Python;ovsdb positive python;
+1225;ovsdb-schema.at:30;schema with ephemeral strong references - C;ovsdb positive;
+1226;ovsdb-schema.at:30;schema with ephemeral strong references - Python;ovsdb positive python;
+1227;ovsdb-schema.at:61;schema without version number - C;ovsdb positive;
+1228;ovsdb-schema.at:61;schema without version number - Python;ovsdb positive python;
+1229;ovsdb-schema.at:71;schema with invalid refTables - C;ovsdb negative;
+1230;ovsdb-schema.at:71;schema with invalid refTables - Python;ovsdb negative;
+1231;ovsdb-schema.at:94;schema with invalid version number - C;ovsdb negative;
+1232;ovsdb-schema.at:94;schema with invalid version number - Python;ovsdb negative;
+1233;ovsdb-condition.at:3;null condition;ovsdb positive;
+1234;ovsdb-condition.at:9;conditions on scalars;ovsdb positive condition;
+1235;ovsdb-condition.at:75;disallowed conditions on scalars;ovsdb negative condition;
+1236;ovsdb-condition.at:112;conditions on sets;ovsdb positive condition;
+1237;ovsdb-condition.at:173;condition sorting;ovsdb positive;
+1238;ovsdb-condition.at:187;evaluating null condition;ovsdb positive;
+1239;ovsdb-condition.at:196;evaluating conditions on integers;ovsdb positive condition;
+1240;ovsdb-condition.at:221;evaluating conditions on reals;ovsdb positive condition;
+1241;ovsdb-condition.at:246;evaluating conditions on booleans;ovsdb positive condition;
+1242;ovsdb-condition.at:270;evaluating conditions on strings;ovsdb positive condition;
+1243;ovsdb-condition.at:295;evaluating conditions on UUIDs;ovsdb positive condition;
+1244;ovsdb-condition.at:321;evaluating conditions on sets;ovsdb positive condition;
+1245;ovsdb-condition.at:403;evaluating conditions on maps (1);ovsdb positive condition;
+1246;ovsdb-condition.at:488;evaluating conditions on maps (2);ovsdb positive condition;
+1247;ovsdb-condition.at:580;evaluating conditions on optional integers;ovsdb positive condition;
+1248;ovsdb-condition.at:607;evaluating conditions on optional strings;ovsdb positive condition;
+1249;ovsdb-condition.at:634;evaluating conditions on optional reals;ovsdb positive condition;
+1250;ovsdb-mutation.at:3;null mutation;ovsdb positive;
+1251;ovsdb-mutation.at:9;mutations on scalars;ovsdb positive mutation;
+1252;ovsdb-mutation.at:37;disallowed mutations on scalars;ovsdb negative mutation;
+1253;ovsdb-mutation.at:102;disallowed mutations on immutable columns;ovsdb negative mutation;
+1254;ovsdb-mutation.at:114;mutations on sets;ovsdb positive mutation;
+1255;ovsdb-mutation.at:166;executing null mutation;ovsdb positive;
+1256;ovsdb-mutation.at:179;executing mutations on integers;ovsdb positive mutation;
+1257;ovsdb-mutation.at:216;integer overflow detection;ovsdb positive mutation;
+1258;ovsdb-mutation.at:297;executing mutations on integers with constraints;ovsdb positive mutation;
+1259;ovsdb-mutation.at:336;executing mutations on reals;ovsdb positive mutation;
+1260;ovsdb-mutation.at:367;real overflow detection;ovsdb positive mutation;
+1261;ovsdb-mutation.at:410;executing mutations on reals with constraints;ovsdb positive mutation;
+1262;ovsdb-mutation.at:443;executing mutations on integer sets;ovsdb positive mutation;
+1263;ovsdb-mutation.at:517;executing mutations on integer sets with constraints;ovsdb positive mutation;
+1264;ovsdb-mutation.at:556;executing mutations on real sets;ovsdb positive mutation;
+1265;ovsdb-mutation.at:629;executing mutations on boolean sets;ovsdb positive mutation;
+1266;ovsdb-mutation.at:679;executing mutations on string sets;ovsdb positive mutation;
+1267;ovsdb-mutation.at:729;executing mutations on uuid sets;ovsdb positive mutation;
+1268;ovsdb-mutation.at:779;executing mutations on integer maps;ovsdb positive mutation;
+1269;ovsdb-query.at:3;queries on scalars;ovsdb positive query;
+1270;ovsdb-query.at:95;queries on sets;ovsdb positive query;
+1271;ovsdb-query.at:176;queries on maps (1);ovsdb positive query;
+1272;ovsdb-query.at:260;queries on maps (2);ovsdb positive query;
+1273;ovsdb-query.at:351;UUID-distinct queries on scalars;ovsdb positive query;
+1274;ovsdb-query.at:444;Boolean-distinct queries on scalars;ovsdb positive query;
+1275;ovsdb-query.at:537;parse colunn set containing bad name;ovsdb negative;
+1276;ovsdb-transaction.at:3;empty table, empty transaction;ovsdb positive;
+1277;ovsdb-transaction.at:17;nonempty table, empty transaction;ovsdb positive;
+1278;ovsdb-transaction.at:41;insert, commit;ovsdb positive transaction;
+1279;ovsdb-transaction.at:70;insert, abort;ovsdb positive transaction;
+1280;ovsdb-transaction.at:98;modify, commit;ovsdb positive transaction;
+1281;ovsdb-transaction.at:127;modify, abort;ovsdb positive transaction;
+1282;ovsdb-transaction.at:156;delete, commit;ovsdb positive transaction;
+1283;ovsdb-transaction.at:181;delete, abort;ovsdb positive transaction;
+1284;ovsdb-transaction.at:207;modify, delete, commit;ovsdb positive transaction;
+1285;ovsdb-transaction.at:234;modify, delete, abort;ovsdb positive transaction;
+1286;ovsdb-transaction.at:262;insert, delete, commit;ovsdb positive transaction;
+1287;ovsdb-transaction.at:291;insert, delete, abort;ovsdb positive transaction;
+1288;ovsdb-transaction.at:322;insert, modify, delete, commit;ovsdb positive transaction;
+1289;ovsdb-transaction.at:353;insert, modify, delete, abort;ovsdb positive transaction;
+1290;ovsdb-transaction.at:385;deletes are aborted cleanly;ovsdb positive transaction;
+1291;ovsdb-execution.at:147;uuid-name must be ;ovsdb execute execution positive;
+1292;ovsdb-execution.at:157;named-uuid must be ;ovsdb execute execution positive;
+1293;ovsdb-execution.at:166;duplicate uuid-name not allowed;ovsdb execute execution positive;
+1294;ovsdb-execution.at:1102;insert default row, query table;ovsdb execute execution positive;
+1295;ovsdb-execution.at:1102;insert row, query table;ovsdb execute execution positive;
+1296;ovsdb-execution.at:1102;insert rows, query by value;ovsdb execute execution positive;
+1297;ovsdb-execution.at:1102;insert rows, query by named-uuid;ovsdb execute execution positive;
+1298;ovsdb-execution.at:1102;insert rows, update rows by value;ovsdb execute execution positive;
+1299;ovsdb-execution.at:1102;insert rows, mutate rows;ovsdb execute execution positive;
+1300;ovsdb-execution.at:1102;insert rows, delete by named-uuid;ovsdb execute execution positive;
+1301;ovsdb-execution.at:1102;insert rows, delete rows by value;ovsdb execute execution positive;
+1302;ovsdb-execution.at:1102;insert rows, delete by (non-matching) value;ovsdb execute execution positive;
+1303;ovsdb-execution.at:1102;insert rows, delete all;ovsdb execute execution positive;
+1304;ovsdb-execution.at:1102;insert row, query table, commit;ovsdb execute execution positive;
+1305;ovsdb-execution.at:1102;insert row, query table, commit durably;ovsdb execute execution positive;
+1306;ovsdb-execution.at:1102;equality wait with correct rows;ovsdb execute execution positive;
+1307;ovsdb-execution.at:1102;equality wait with extra row;ovsdb execute execution positive;
+1308;ovsdb-execution.at:1102;equality wait with missing row;ovsdb execute execution positive;
+1309;ovsdb-execution.at:1102;inequality wait with correct rows;ovsdb execute execution positive;
+1310;ovsdb-execution.at:1102;inequality wait with extra row;ovsdb execute execution positive;
+1311;ovsdb-execution.at:1102;inequality wait with missing row;ovsdb execute execution positive;
+1312;ovsdb-execution.at:1102;insert and update constraints;ovsdb execute execution positive;
+1313;ovsdb-execution.at:1102;index uniqueness checking;ovsdb execute execution positive;
+1314;ovsdb-execution.at:1102;referential integrity -- simple;ovsdb execute execution positive;
+1315;ovsdb-execution.at:1102;referential integrity -- mutual references;ovsdb execute execution positive;
+1316;ovsdb-execution.at:1102;weak references;ovsdb execute execution positive;
+1317;ovsdb-execution.at:1102;immutable columns;ovsdb execute execution positive;
+1318;ovsdb-execution.at:1102;garbage collection;ovsdb execute execution positive;
+1319;ovsdb-trigger.at:15;trigger fires immediately;ovsdb execute execution trigger positive;
+1320;ovsdb-trigger.at:38;trigger times out;ovsdb execute execution trigger positive;
+1321;ovsdb-trigger.at:61;trigger fires after delay;ovsdb execute execution trigger positive;
+1322;ovsdb-trigger.at:92;delayed trigger modifies database;ovsdb execute execution trigger positive;
+1323;ovsdb-trigger.at:132;one delayed trigger wakes up another;ovsdb execute execution trigger positive;
+1324;ovsdb-tool.at:30;insert default row, query table;ovsdb file positive;
+1325;ovsdb-tool.at:30;insert row, query table;ovsdb file positive;
+1326;ovsdb-tool.at:30;insert rows, query by value;ovsdb file positive;
+1327;ovsdb-tool.at:30;insert rows, query by named-uuid;ovsdb file positive;
+1328;ovsdb-tool.at:30;insert rows, update rows by value;ovsdb file positive;
+1329;ovsdb-tool.at:30;insert rows, mutate rows;ovsdb file positive;
+1330;ovsdb-tool.at:30;insert rows, delete by named-uuid;ovsdb file positive;
+1331;ovsdb-tool.at:30;insert rows, delete rows by value;ovsdb file positive;
+1332;ovsdb-tool.at:30;insert rows, delete by (non-matching) value;ovsdb file positive;
+1333;ovsdb-tool.at:30;insert rows, delete all;ovsdb file positive;
+1334;ovsdb-tool.at:30;insert row, query table, commit;ovsdb file positive;
+1335;ovsdb-tool.at:30;insert row, query table, commit durably;ovsdb file positive;
+1336;ovsdb-tool.at:30;equality wait with correct rows;ovsdb file positive;
+1337;ovsdb-tool.at:30;equality wait with extra row;ovsdb file positive;
+1338;ovsdb-tool.at:30;equality wait with missing row;ovsdb file positive;
+1339;ovsdb-tool.at:30;inequality wait with correct rows;ovsdb file positive;
+1340;ovsdb-tool.at:30;inequality wait with extra row;ovsdb file positive;
+1341;ovsdb-tool.at:30;inequality wait with missing row;ovsdb file positive;
+1342;ovsdb-tool.at:30;insert and update constraints;ovsdb file positive;
+1343;ovsdb-tool.at:30;index uniqueness checking;ovsdb file positive;
+1344;ovsdb-tool.at:30;referential integrity -- simple;ovsdb file positive;
+1345;ovsdb-tool.at:30;referential integrity -- mutual references;ovsdb file positive;
+1346;ovsdb-tool.at:30;weak references;ovsdb file positive;
+1347;ovsdb-tool.at:30;immutable columns;ovsdb file positive;
+1348;ovsdb-tool.at:30;garbage collection;ovsdb file positive;
+1349;ovsdb-tool.at:32;transaction comments;ovsdb file positive;
+1350;ovsdb-tool.at:50;ovsdb-tool compact;ovsdb file positive;
+1351;ovsdb-tool.at:158;ovsdb-tool convert -- removing a column;ovsdb file positive;
+1352;ovsdb-tool.at:226;ovsdb-tool convert -- adding a column;ovsdb file positive;
+1353;ovsdb-tool.at:293;ovsdb-tool schema-version;ovsdb file positive;
+1354;ovsdb-tool.at:300;ovsdb-tool db-version;ovsdb file positive;
+1355;ovsdb-tool.at:309;ovsdb-tool schema-cksum;ovsdb file positive;
+1356;ovsdb-tool.at:316;ovsdb-tool db-cksum;ovsdb file positive;
+1357;ovsdb-tool.at:325;ovsdb-tool needs-conversion (no conversion needed);ovsdb file positive;
+1358;ovsdb-tool.at:334;ovsdb-tool needs-conversion (conversion needed);ovsdb file positive;
+1359;ovsdb-server.at:39;insert default row, query table;ovsdb server positive unix;
+1360;ovsdb-server.at:39;insert row, query table;ovsdb server positive unix;
+1361;ovsdb-server.at:39;insert rows, query by value;ovsdb server positive unix;
+1362;ovsdb-server.at:39;insert rows, query by named-uuid;ovsdb server positive unix;
+1363;ovsdb-server.at:39;insert rows, update rows by value;ovsdb server positive unix;
+1364;ovsdb-server.at:39;insert rows, mutate rows;ovsdb server positive unix;
+1365;ovsdb-server.at:39;insert rows, delete by named-uuid;ovsdb server positive unix;
+1366;ovsdb-server.at:39;insert rows, delete rows by value;ovsdb server positive unix;
+1367;ovsdb-server.at:39;insert rows, delete by (non-matching) value;ovsdb server positive unix;
+1368;ovsdb-server.at:39;insert rows, delete all;ovsdb server positive unix;
+1369;ovsdb-server.at:39;insert row, query table, commit;ovsdb server positive unix;
+1370;ovsdb-server.at:39;insert row, query table, commit durably;ovsdb server positive unix;
+1371;ovsdb-server.at:39;equality wait with correct rows;ovsdb server positive unix;
+1372;ovsdb-server.at:39;equality wait with extra row;ovsdb server positive unix;
+1373;ovsdb-server.at:39;equality wait with missing row;ovsdb server positive unix;
+1374;ovsdb-server.at:39;inequality wait with correct rows;ovsdb server positive unix;
+1375;ovsdb-server.at:39;inequality wait with extra row;ovsdb server positive unix;
+1376;ovsdb-server.at:39;inequality wait with missing row;ovsdb server positive unix;
+1377;ovsdb-server.at:39;insert and update constraints;ovsdb server positive unix;
+1378;ovsdb-server.at:39;index uniqueness checking;ovsdb server positive unix;
+1379;ovsdb-server.at:39;referential integrity -- simple;ovsdb server positive unix;
+1380;ovsdb-server.at:39;referential integrity -- mutual references;ovsdb server positive unix;
+1381;ovsdb-server.at:39;weak references;ovsdb server positive unix;
+1382;ovsdb-server.at:39;immutable columns;ovsdb server positive unix;
+1383;ovsdb-server.at:39;garbage collection;ovsdb server positive unix;
+1384;ovsdb-server.at:43;truncating corrupted database log;ovsdb server positive unix;
+1385;ovsdb-server.at:91;truncating database log with bad transaction;ovsdb server positive unix;
+1386;ovsdb-server.at:140;ovsdb-client get-schema-version;ovsdb server positive;
+1387;ovsdb-server.at:151;database multiplexing implementation;ovsdb server positive;
+1388;ovsdb-server.at:171;ovsdb-server/add-db and remove-db;ovsdb server positive;
+1389;ovsdb-server.at:256;ovsdb-server/add-db with --monitor;ovsdb server positive;
+1390;ovsdb-server.at:289;ovsdb-server/add-db and remove-db with --monitor;ovsdb server positive;
+1391;ovsdb-server.at:320;--remote=db: implementation;ovsdb server positive;
+1392;ovsdb-server.at:385;ovsdb-server/add-remote and remove-remote;ovsdb server positive;
+1393;ovsdb-server.at:439;ovsdb-server/add-remote with --monitor;ovsdb server positive;
+1394;ovsdb-server.at:470;ovsdb-server/add-remote and remove-remote with --monitor;ovsdb server positive;
+1395;ovsdb-server.at:505;SSL db: implementation;ovsdb server positive ssl \$5;
+1396;ovsdb-server.at:562;compacting online;ovsdb server compact;
+1397;ovsdb-server.at:695;ovsdb-server combines updates on backlogged connections;;
+1398;ovsdb-server.at:832;insert default row, query table;ovsdb server positive ssl;
+1399;ovsdb-server.at:832;insert row, query table;ovsdb server positive ssl;
+1400;ovsdb-server.at:832;insert rows, query by value;ovsdb server positive ssl;
+1401;ovsdb-server.at:832;insert rows, query by named-uuid;ovsdb server positive ssl;
+1402;ovsdb-server.at:832;insert rows, update rows by value;ovsdb server positive ssl;
+1403;ovsdb-server.at:832;insert rows, mutate rows;ovsdb server positive ssl;
+1404;ovsdb-server.at:832;insert rows, delete by named-uuid;ovsdb server positive ssl;
+1405;ovsdb-server.at:832;insert rows, delete rows by value;ovsdb server positive ssl;
+1406;ovsdb-server.at:832;insert rows, delete by (non-matching) value;ovsdb server positive ssl;
+1407;ovsdb-server.at:832;insert rows, delete all;ovsdb server positive ssl;
+1408;ovsdb-server.at:832;insert row, query table, commit;ovsdb server positive ssl;
+1409;ovsdb-server.at:832;insert row, query table, commit durably;ovsdb server positive ssl;
+1410;ovsdb-server.at:832;equality wait with correct rows;ovsdb server positive ssl;
+1411;ovsdb-server.at:832;equality wait with extra row;ovsdb server positive ssl;
+1412;ovsdb-server.at:832;equality wait with missing row;ovsdb server positive ssl;
+1413;ovsdb-server.at:832;inequality wait with correct rows;ovsdb server positive ssl;
+1414;ovsdb-server.at:832;inequality wait with extra row;ovsdb server positive ssl;
+1415;ovsdb-server.at:832;inequality wait with missing row;ovsdb server positive ssl;
+1416;ovsdb-server.at:832;insert and update constraints;ovsdb server positive ssl;
+1417;ovsdb-server.at:832;index uniqueness checking;ovsdb server positive ssl;
+1418;ovsdb-server.at:832;referential integrity -- simple;ovsdb server positive ssl;
+1419;ovsdb-server.at:832;referential integrity -- mutual references;ovsdb server positive ssl;
+1420;ovsdb-server.at:832;weak references;ovsdb server positive ssl;
+1421;ovsdb-server.at:832;immutable columns;ovsdb server positive ssl;
+1422;ovsdb-server.at:832;garbage collection;ovsdb server positive ssl;
+1423;ovsdb-server.at:871;insert default row, query table;ovsdb server positive ssl6;
+1424;ovsdb-server.at:875;ovsdb-client get-schema-version - tcp socket;ovsdb server positive tcp;
+1425;ovsdb-server.at:921;insert default row, query table;ovsdb server positive tcp;
+1426;ovsdb-server.at:921;insert row, query table;ovsdb server positive tcp;
+1427;ovsdb-server.at:921;insert rows, query by value;ovsdb server positive tcp;
+1428;ovsdb-server.at:921;insert rows, query by named-uuid;ovsdb server positive tcp;
+1429;ovsdb-server.at:921;insert rows, update rows by value;ovsdb server positive tcp;
+1430;ovsdb-server.at:921;insert rows, mutate rows;ovsdb server positive tcp;
+1431;ovsdb-server.at:921;insert rows, delete by named-uuid;ovsdb server positive tcp;
+1432;ovsdb-server.at:921;insert rows, delete rows by value;ovsdb server positive tcp;
+1433;ovsdb-server.at:921;insert rows, delete by (non-matching) value;ovsdb server positive tcp;
+1434;ovsdb-server.at:921;insert rows, delete all;ovsdb server positive tcp;
+1435;ovsdb-server.at:921;insert row, query table, commit;ovsdb server positive tcp;
+1436;ovsdb-server.at:921;insert row, query table, commit durably;ovsdb server positive tcp;
+1437;ovsdb-server.at:921;equality wait with correct rows;ovsdb server positive tcp;
+1438;ovsdb-server.at:921;equality wait with extra row;ovsdb server positive tcp;
+1439;ovsdb-server.at:921;equality wait with missing row;ovsdb server positive tcp;
+1440;ovsdb-server.at:921;inequality wait with correct rows;ovsdb server positive tcp;
+1441;ovsdb-server.at:921;inequality wait with extra row;ovsdb server positive tcp;
+1442;ovsdb-server.at:921;inequality wait with missing row;ovsdb server positive tcp;
+1443;ovsdb-server.at:921;insert and update constraints;ovsdb server positive tcp;
+1444;ovsdb-server.at:921;index uniqueness checking;ovsdb server positive tcp;
+1445;ovsdb-server.at:921;referential integrity -- simple;ovsdb server positive tcp;
+1446;ovsdb-server.at:921;referential integrity -- mutual references;ovsdb server positive tcp;
+1447;ovsdb-server.at:921;weak references;ovsdb server positive tcp;
+1448;ovsdb-server.at:921;immutable columns;ovsdb server positive tcp;
+1449;ovsdb-server.at:921;garbage collection;ovsdb server positive tcp;
+1450;ovsdb-server.at:959;insert default row, query table;ovsdb server positive tcp6;
+1451;ovsdb-server.at:996;insert default row, query table;ovsdb server positive transient;
+1452;ovsdb-server.at:996;insert row, query table;ovsdb server positive transient;
+1453;ovsdb-server.at:996;insert rows, query by value;ovsdb server positive transient;
+1454;ovsdb-server.at:996;insert rows, query by named-uuid;ovsdb server positive transient;
+1455;ovsdb-server.at:996;insert rows, update rows by value;ovsdb server positive transient;
+1456;ovsdb-server.at:996;insert rows, mutate rows;ovsdb server positive transient;
+1457;ovsdb-server.at:996;insert rows, delete by named-uuid;ovsdb server positive transient;
+1458;ovsdb-server.at:996;insert rows, delete rows by value;ovsdb server positive transient;
+1459;ovsdb-server.at:996;insert rows, delete by (non-matching) value;ovsdb server positive transient;
+1460;ovsdb-server.at:996;insert rows, delete all;ovsdb server positive transient;
+1461;ovsdb-server.at:996;insert row, query table, commit;ovsdb server positive transient;
+1462;ovsdb-server.at:996;insert row, query table, commit durably;ovsdb server positive transient;
+1463;ovsdb-server.at:996;equality wait with correct rows;ovsdb server positive transient;
+1464;ovsdb-server.at:996;equality wait with extra row;ovsdb server positive transient;
+1465;ovsdb-server.at:996;equality wait with missing row;ovsdb server positive transient;
+1466;ovsdb-server.at:996;inequality wait with correct rows;ovsdb server positive transient;
+1467;ovsdb-server.at:996;inequality wait with extra row;ovsdb server positive transient;
+1468;ovsdb-server.at:996;inequality wait with missing row;ovsdb server positive transient;
+1469;ovsdb-server.at:996;insert and update constraints;ovsdb server positive transient;
+1470;ovsdb-server.at:996;index uniqueness checking;ovsdb server positive transient;
+1471;ovsdb-server.at:996;referential integrity -- simple;ovsdb server positive transient;
+1472;ovsdb-server.at:996;referential integrity -- mutual references;ovsdb server positive transient;
+1473;ovsdb-server.at:996;weak references;ovsdb server positive transient;
+1474;ovsdb-server.at:996;immutable columns;ovsdb server positive transient;
+1475;ovsdb-server.at:996;garbage collection;ovsdb server positive transient;
+1476;ovsdb-monitor.at:48;monitor insert into empty table;ovsdb server monitor positive;
+1477;ovsdb-monitor.at:60;monitor insert into populated table;ovsdb server monitor positive;
+1478;ovsdb-monitor.at:78;monitor delete;ovsdb server monitor positive;
+1479;ovsdb-monitor.at:96;monitor row update;ovsdb server monitor positive;
+1480;ovsdb-monitor.at:116;monitor no-op row updates;ovsdb server monitor positive;
+1481;ovsdb-monitor.at:139;monitor insert-and-update transaction;ovsdb server monitor positive;
+1482;ovsdb-monitor.at:162;monitor insert-update-and-delete transaction;ovsdb server monitor positive;
+1483;ovsdb-monitor.at:191;monitor weak reference change;ovsdb server monitor positive;
+1484;ovsdb-monitor.at:226;monitor insert-update-and-delete transaction;ovsdb server monitor positive;
+1485;ovsdb-monitor.at:277;monitor all operations;ovsdb server monitor positive;
+1486;ovsdb-monitor.at:297;monitor initial only;ovsdb server monitor positive;
+1487;ovsdb-monitor.at:304;monitor insert only;ovsdb server monitor positive;
+1488;ovsdb-monitor.at:311;monitor delete only;ovsdb server monitor positive;
+1489;ovsdb-monitor.at:319;monitor modify only;ovsdb server monitor positive;
+1490;ovsdb-idl.at:103;simple idl, initially empty, no ops - C;ovsdb server idl positive;
+1491;ovsdb-idl.at:103;simple idl, initially empty, no ops - Python;ovsdb server idl positive python;
+1492;ovsdb-idl.at:103;simple idl, initially empty, no ops - Python tcp;ovsdb server idl positive python with tcp socket;
+1493;ovsdb-idl.at:103;simple idl, initially empty, no ops - Python tcp6;ovsdb server idl positive python with tcp6 socket;
+1494;ovsdb-idl.at:110;simple idl, initially empty, various ops - C;ovsdb server idl positive;
+1495;ovsdb-idl.at:110;simple idl, initially empty, various ops - Python;ovsdb server idl positive python;
+1496;ovsdb-idl.at:110;simple idl, initially empty, various ops - Python tcp;ovsdb server idl positive python with tcp socket;
+1497;ovsdb-idl.at:110;simple idl, initially empty, various ops - Python tcp6;ovsdb server idl positive python with tcp6 socket;
+1498;ovsdb-idl.at:188;simple idl, initially populated - C;ovsdb server idl positive;
+1499;ovsdb-idl.at:188;simple idl, initially populated - Python;ovsdb server idl positive python;
+1500;ovsdb-idl.at:188;simple idl, initially populated - Python tcp;ovsdb server idl positive python with tcp socket;
+1501;ovsdb-idl.at:188;simple idl, initially populated - Python tcp6;ovsdb server idl positive python with tcp6 socket;
+1502;ovsdb-idl.at:219;simple idl, writing via IDL - C;ovsdb server idl positive;
+1503;ovsdb-idl.at:219;simple idl, writing via IDL - Python;ovsdb server idl positive python;
+1504;ovsdb-idl.at:219;simple idl, writing via IDL - Python tcp;ovsdb server idl positive python with tcp socket;
+1505;ovsdb-idl.at:219;simple idl, writing via IDL - Python tcp6;ovsdb server idl positive python with tcp6 socket;
+1506;ovsdb-idl.at:250;simple idl, handling verification failure - C;ovsdb server idl positive;
+1507;ovsdb-idl.at:250;simple idl, handling verification failure - Python;ovsdb server idl positive python;
+1508;ovsdb-idl.at:250;simple idl, handling verification failure - Python tcp;ovsdb server idl positive python with tcp socket;
+1509;ovsdb-idl.at:250;simple idl, handling verification failure - Python tcp6;ovsdb server idl positive python with tcp6 socket;
+1510;ovsdb-idl.at:281;simple idl, increment operation - C;ovsdb server idl positive;
+1511;ovsdb-idl.at:281;simple idl, increment operation - Python;ovsdb server idl positive python;
+1512;ovsdb-idl.at:281;simple idl, increment operation - Python tcp;ovsdb server idl positive python with tcp socket;
+1513;ovsdb-idl.at:281;simple idl, increment operation - Python tcp6;ovsdb server idl positive python with tcp6 socket;
+1514;ovsdb-idl.at:293;simple idl, aborting - C;ovsdb server idl positive;
+1515;ovsdb-idl.at:293;simple idl, aborting - Python;ovsdb server idl positive python;
+1516;ovsdb-idl.at:293;simple idl, aborting - Python tcp;ovsdb server idl positive python with tcp socket;
+1517;ovsdb-idl.at:293;simple idl, aborting - Python tcp6;ovsdb server idl positive python with tcp6 socket;
+1518;ovsdb-idl.at:307;simple idl, destroy without commit or abort - C;ovsdb server idl positive;
+1519;ovsdb-idl.at:307;simple idl, destroy without commit or abort - Python;ovsdb server idl positive python;
+1520;ovsdb-idl.at:307;simple idl, destroy without commit or abort - Python tcp;ovsdb server idl positive python with tcp socket;
+1521;ovsdb-idl.at:307;simple idl, destroy without commit or abort - Python tcp6;ovsdb server idl positive python with tcp6 socket;
+1522;ovsdb-idl.at:321;self-linking idl, consistent ops - C;ovsdb server idl positive;
+1523;ovsdb-idl.at:321;self-linking idl, consistent ops - Python;ovsdb server idl positive python;
+1524;ovsdb-idl.at:321;self-linking idl, consistent ops - Python tcp;ovsdb server idl positive python with tcp socket;
+1525;ovsdb-idl.at:321;self-linking idl, consistent ops - Python tcp6;ovsdb server idl positive python with tcp6 socket;
+1526;ovsdb-idl.at:365;self-linking idl, inconsistent ops - C;ovsdb server idl positive;
+1527;ovsdb-idl.at:365;self-linking idl, inconsistent ops - Python;ovsdb server idl positive python;
+1528;ovsdb-idl.at:365;self-linking idl, inconsistent ops - Python tcp;ovsdb server idl positive python with tcp socket;
+1529;ovsdb-idl.at:365;self-linking idl, inconsistent ops - Python tcp6;ovsdb server idl positive python with tcp6 socket;
+1530;ovsdb-idl.at:413;self-linking idl, sets - C;ovsdb server idl positive;
+1531;ovsdb-idl.at:413;self-linking idl, sets - Python;ovsdb server idl positive python;
+1532;ovsdb-idl.at:413;self-linking idl, sets - Python tcp;ovsdb server idl positive python with tcp socket;
+1533;ovsdb-idl.at:413;self-linking idl, sets - Python tcp6;ovsdb server idl positive python with tcp6 socket;
+1534;ovsdb-idl.at:463;external-linking idl, consistent ops - C;ovsdb server idl positive;
+1535;ovsdb-idl.at:463;external-linking idl, consistent ops - Python;ovsdb server idl positive python;
+1536;ovsdb-idl.at:463;external-linking idl, consistent ops - Python tcp;ovsdb server idl positive python with tcp socket;
+1537;ovsdb-idl.at:463;external-linking idl, consistent ops - Python tcp6;ovsdb server idl positive python with tcp6 socket;
+1538;ovsdb-idl.at:481;external-linking idl, insert ops - Python;ovsdb server idl positive python;
+1539;ovsdb-idl.at:491;getattr idl, insert ops - Python;ovsdb server idl positive python;
+1540;ovsdb-idl.at:500;row-from-json idl, whats this - Python;ovsdb server idl positive python;
+1541;ovsdb-idl.at:517;idl handling of missing tables and columns - C;ovsdb server idl positive;
+1542;ovs-vsctl.at:145;ovs-vsctl connection retry;;
+1543;ovs-vsctl.at:191;add-br a;ovs-vsctl;
+1544;ovs-vsctl.at:201;add-br a, add-br a;ovs-vsctl;
+1545;ovs-vsctl.at:211;add-br a, add-br b;ovs-vsctl;
+1546;ovs-vsctl.at:228;add-br a, add-br b, del-br a;ovs-vsctl;
+1547;ovs-vsctl.at:239;add-br a, del-br a, add-br a;ovs-vsctl;
+1548;ovs-vsctl.at:259;add-br a, add-port a a1, add-port a a2;ovs-vsctl;
+1549;ovs-vsctl.at:273;add-br a, add-port a a1, add-port a a1;ovs-vsctl;
+1550;ovs-vsctl.at:285;add-br a b, add-port a a1, add-port b b1, del-br a;ovs-vsctl;
+1551;ovs-vsctl.at:307;add-br a, add-bond a bond0 a1 a2 a3;ovs-vsctl;
+1552;ovs-vsctl.at:325;add-br a b, add-port a a1, add-port b b1, del-port a a1;ovs-vsctl;
+1553;ovs-vsctl.at:356;add-br a, add-bond a bond0 a1 a2 a3, del-port bond0;ovs-vsctl;
+1554;ovs-vsctl.at:373;external IDs;ovs-vsctl;
+1555;ovs-vsctl.at:429;controllers;controller ovs-vsctl;
+1556;ovs-vsctl.at:559;simple fake bridge (VLAN 9);ovs-vsctl fake-bridge;
+1557;ovs-vsctl.at:559;list bridges -- real and fake (VLAN 9);ovs-vsctl fake-bridge;
+1558;ovs-vsctl.at:559;simple fake bridge + del-br fake bridge (VLAN 9);ovs-vsctl fake-bridge;
+1559;ovs-vsctl.at:559;simple fake bridge + del-br real bridge (VLAN 9);ovs-vsctl fake-bridge;
+1560;ovs-vsctl.at:559;simple fake bridge + external IDs (VLAN 9);ovs-vsctl fake-bridge;
+1561;ovs-vsctl.at:560;simple fake bridge (VLAN 0);ovs-vsctl fake-bridge;
+1562;ovs-vsctl.at:560;list bridges -- real and fake (VLAN 0);ovs-vsctl fake-bridge;
+1563;ovs-vsctl.at:560;simple fake bridge + del-br fake bridge (VLAN 0);ovs-vsctl fake-bridge;
+1564;ovs-vsctl.at:560;simple fake bridge + del-br real bridge (VLAN 0);ovs-vsctl fake-bridge;
+1565;ovs-vsctl.at:560;simple fake bridge + external IDs (VLAN 0);ovs-vsctl fake-bridge;
+1566;ovs-vsctl.at:572;fake bridge on bond;ovs-vsctl fake-bridge;
+1567;ovs-vsctl.at:584;fake bridge on bond + del-br fake bridge;ovs-vsctl fake-bridge;
+1568;ovs-vsctl.at:596;fake bridge on bond + del-br real bridge;ovs-vsctl fake-bridge;
+1569;ovs-vsctl.at:608;managers;manager ovs-vsctl;
+1570;ovs-vsctl.at:634;database commands -- positive checks;ovs-vsctl;
+1571;ovs-vsctl.at:747;database commands -- negative checks;ovs-vsctl;
+1572;ovs-vsctl.at:872;database commands -- conditions;ovs-vsctl;
+1573;ovs-vsctl.at:1007;database commands -- wait-until immediately true;ovs-vsctl;
+1574;ovs-vsctl.at:1026;database commands -- wait-until must wait;ovs-vsctl;
+1575;ovs-vsctl.at:1060;--id option on create, get commands;ovs-vsctl;
+1576;ovs-vsctl.at:1109;unreferenced record warnings;ovs-vsctl;
+1577;ovs-vsctl.at:1143;created row UUID is wrong in same execution;ovs-vsctl;
+1578;ovs-vsctl.at:1180;--all option on destroy command;ovs-vsctl;
+1579;ovs-vsctl.at:1229;add-port -- reserved names 1;;
+1580;ovs-vsctl.at:1260;add-port -- reserved names 2;;
+1581;ovs-vsctl.at:1300;naming in db commands;;
+1582;ovs-monitor-ipsec.at:3;ovs-monitor-ipsec;;
+1583;ovs-xapi-sync.at:3;ovs-xapi-sync;;
+1584;interface-reconfigure.at:697;non-VLAN, non-bond;interface-reconfigure;
+1585;interface-reconfigure.at:774;VLAN, non-bond;interface-reconfigure;
+1586;interface-reconfigure.at:849;Bond, non-VLAN;interface-reconfigure;
+1587;interface-reconfigure.at:939;VLAN on bond;interface-reconfigure;
+1588;interface-reconfigure.at:1040;Re-create port with different types;interface-reconfigure;
+1589;stp.at:3;STP example from IEEE 802.1D-1998;stp;
+1590;stp.at:27;STP example from IEEE 802.1D-2004 figures 17.4 and 17.5;stp;
+1591;stp.at:70;STP example from IEEE 802.1D-2004 figure 17.6;stp;
+1592;stp.at:96;STP example from IEEE 802.1D-2004 figure 17.7;stp;
+1593;stp.at:125;STP.io.1.1: Link Failure;stp;
+1594;stp.at:164;STP.io.1.2: Repeated Network;stp;
+1595;stp.at:188;STP.io.1.4: Network Initialization;stp;
+1596;stp.at:214;STP.io.1.5: Topology Change;stp;
+1597;stp.at:267;STP.op.1.1 and STP.op.1.2;stp;
+1598;stp.at:281;STP.op.1.4: All Ports Initialized to Designated Ports;stp;
+1599;stp.at:302;STP.op.3.1: Root Bridge Selection: Root ID Values;stp;
+1600;stp.at:322;STP.op.3.3: Root Bridge Selection: Bridge ID Values;stp;
+1601;stp.at:345;STP.op.3.3: Root Bridge Selection: Bridge ID Values;stp;
+1602;stp.at:380;STP - dummy interface;;
+1603;rstp.at:3;RSTP Single bridge;rstp;
+1604;rstp.at:13;RSTP Link failure;rstp;
+1605;rstp.at:32;RSTP Double link Failure;rstp;
+1606;rstp.at:74;RSTP example from IEEE 802.1D-2004 figures 17.4 and 17.5;rstp;
+1607;rstp.at:111;RSTP example from IEEE 802.1D-2004 figure 17.6;rstp;
+1608;rstp.at:131;RSTP example from IEEE 802.1D-2004 figure 17.7;rstp;
+1609;rstp.at:163;RSTP - dummy interface;;
+1610;vlog.at:3;vlog - Python;;
+1611;vlog.at:104;vlog - vlog/reopen - Python;;
+1612;vlog.at:133;vlog - vlog/reopen without log file - Python;;
+1613;vlog.at:151;vlog - vlog/reopen can't reopen log file - Python;;
+1614;vlog.at:183;vlog - vlog/set and vlog/list - Python;;
+1615;vlog.at:238;vlog - RFC5424 facility;;
+1616;vlog.at:279;vlog - RFC5424 facility - Python;;
+1617;vtep-ctl.at:136;add-ps a;vtep-ctl;
+1618;vtep-ctl.at:144;add-ps a, add-ps a;vtep-ctl;
+1619;vtep-ctl.at:154;add-ps a, add-ps b;vtep-ctl;
+1620;vtep-ctl.at:163;add-ps a, add-ps b, del-ps a;vtep-ctl;
+1621;vtep-ctl.at:172;add-ps a, del-ps a, add-ps a;vtep-ctl;
+1622;vtep-ctl.at:186;add-ps a, add-port a a1, add-port a a2;vtep-ctl;
+1623;vtep-ctl.at:199;add-ps a, add-port a a1, add-port a a1;vtep-ctl;
+1624;vtep-ctl.at:211;add-ps a b, add-port a a1, add-port b b1, del-ps a;vtep-ctl;
+1625;vtep-ctl.at:232;add-ps a b, add-port a a1, add-port b b1, del-port a a1;vtep-ctl;
+1626;vtep-ctl.at:249;add-ps a b, add-port a p1, add-port b p1, del-port a p1;vtep-ctl;
+1627;vtep-ctl.at:272;add-ls a;vtep-ctl;
+1628;vtep-ctl.at:280;add-ls a, add-ls a;vtep-ctl;
+1629;vtep-ctl.at:290;add-ls a, add-ls b;vtep-ctl;
+1630;vtep-ctl.at:299;add-ls a, add-ls b, del-ls a;vtep-ctl;
+1631;vtep-ctl.at:308;add-ls a, del-ls a, add-ls a;vtep-ctl;
+1632;vtep-ctl.at:326;bind-ls ps1 pp1 300 ls1;vtep-ctl;
+1633;vtep-ctl.at:344;bind-ls ps1 pp1 300 ls1, bind-ls ps1 pp1 400 ls2;vtep-ctl;
+1634;vtep-ctl.at:366;bind-ls ps1 pp1 300, bind-ls ps2 pp2 300 ls2;vtep-ctl;
+1635;vtep-ctl.at:397;add-ucast-local ls1;vtep-ctl;
+1636;vtep-ctl.at:424;add-ucast-local ls1, overwrite;vtep-ctl;
+1637;vtep-ctl.at:444;add-ucast-local ls1, del-ucast-local ls1;vtep-ctl;
+1638;vtep-ctl.at:475;add-ucast-remote ls1;vtep-ctl;
+1639;vtep-ctl.at:502;add-ucast-remote ls1, overwrite;vtep-ctl;
+1640;vtep-ctl.at:522;add-ucast-remote ls1, del-ucast-remote ls1;vtep-ctl;
+1641;vtep-ctl.at:553;add-ucast-local ls1, add-ucast-remote ls1;vtep-ctl;
+1642;vtep-ctl.at:584;add-mcast-local ls1;vtep-ctl;
+1643;vtep-ctl.at:613;add-mcast-local ls1, del-mcast-local ls1;vtep-ctl;
+1644;vtep-ctl.at:650;add-mcast-remote ls1;vtep-ctl;
+1645;vtep-ctl.at:679;add-mcast-remote ls1, del-mcast-remote ls1;vtep-ctl;
+1646;vtep-ctl.at:716;add-mcast-local ls1, add-mcast-remote ls1;vtep-ctl;
+1647;vtep-ctl.at:751;add local and remote macs, clear-local-macs;vtep-ctl;
+1648;vtep-ctl.at:808;add local and remote macs, clear-remote-macs;vtep-ctl;
+1649;vtep-ctl.at:868;managers;manager vtep-ctl;
+1650;auto-attach.at:3;auto-attach - packet tests;auto-attach;
 "
 # List of the all the test groups.
 at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
@@ -2269,7 +2269,7 @@
   for at_grp
   do
     eval at_value=\$$at_grp
-    if test $at_value -lt 1 || test $at_value -gt 1647; then
+    if test $at_value -lt 1 || test $at_value -gt 1650; then
       $as_echo "invalid test group: $at_value" >&2
       exit 1
     fi
@@ -2567,7 +2567,7 @@
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-openvswitch 2.4.0 test suite test groups:
+openvswitch 2.4.1 test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -2608,10 +2608,10 @@
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (openvswitch 2.4.0)" &&
+  $as_echo "$as_me (openvswitch 2.4.1)" &&
   cat <<\_ATEOF || at_write_fail=1
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This test suite is free software; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
@@ -2658,313 +2658,313 @@
 # Category starts at test group 30.
 at_banner_text_6="library unit tests"
 # Banner 7. heap.at:1
-# Category starts at test group 64.
+# Category starts at test group 65.
 at_banner_text_7="heap library"
 # Banner 8. bundle.at:1
-# Category starts at test group 70.
+# Category starts at test group 71.
 at_banner_text_8="bundle link selection"
 # Banner 9. classifier.at:1
-# Category starts at test group 79.
+# Category starts at test group 80.
 at_banner_text_9="flow classifier unit tests"
 # Banner 10. classifier.at:20
-# Category starts at test group 91.
+# Category starts at test group 92.
 at_banner_text_10="miniflow unit tests"
 # Banner 11. classifier.at:30
-# Category starts at test group 94.
+# Category starts at test group 95.
 at_banner_text_11="flow classifier lookup segmentation"
 # Banner 12. classifier.at:68
-# Category starts at test group 95.
+# Category starts at test group 96.
 at_banner_text_12="flow classifier prefix lookup"
 # Banner 13. classifier.at:132
-# Category starts at test group 96.
+# Category starts at test group 97.
 at_banner_text_13="conjunctive match"
 # Banner 14. check-structs.at:1
-# Category starts at test group 100.
+# Category starts at test group 101.
 at_banner_text_14="struct alignment checker unit tests"
 # Banner 15. daemon.at:1
-# Category starts at test group 104.
+# Category starts at test group 105.
 at_banner_text_15="daemon unit tests - C"
 # Banner 16. daemon-py.at:1
-# Category starts at test group 111.
+# Category starts at test group 112.
 at_banner_text_16="daemon unit tests - Python"
 # Banner 17. ofp-actions.at:1
-# Category starts at test group 120.
+# Category starts at test group 121.
 at_banner_text_17="OpenFlow actions"
 # Banner 18. ofp-print.at:1
-# Category starts at test group 129.
+# Category starts at test group 130.
 at_banner_text_18="ofp-print"
 # Banner 19. ofp-util.at:1
-# Category starts at test group 320.
+# Category starts at test group 321.
 at_banner_text_19="OpenFlow utilities"
 # Banner 20. ofp-errors.at:1
-# Category starts at test group 321.
+# Category starts at test group 322.
 at_banner_text_20="ofp-errors tests"
 # Banner 21. ovs-ofctl.at:1
-# Category starts at test group 335.
+# Category starts at test group 336.
 at_banner_text_21="ovs-ofctl"
 # Banner 22. odp.at:1
-# Category starts at test group 371.
+# Category starts at test group 372.
 at_banner_text_22="datapath parsing and formatting"
 # Banner 23. mpls-xlate.at:1
-# Category starts at test group 375.
+# Category starts at test group 376.
 at_banner_text_23="mpls_xlate"
 # Banner 24. multipath.at:1
-# Category starts at test group 376.
+# Category starts at test group 377.
 at_banner_text_24="multipath link selection"
 # Banner 25. learn.at:1
-# Category starts at test group 385.
+# Category starts at test group 386.
 at_banner_text_25="learning action"
 # Banner 26. vconn.at:21
-# Category starts at test group 401.
+# Category starts at test group 402.
 at_banner_text_26="vconn library -- unix class"
 # Banner 27. vconn.at:22
-# Category starts at test group 409.
+# Category starts at test group 410.
 at_banner_text_27="vconn library -- tcp class"
 # Banner 28. vconn.at:23
-# Category starts at test group 417.
+# Category starts at test group 418.
 at_banner_text_28="vconn library -- ssl class"
 # Banner 29. file_name.at:1
-# Category starts at test group 425.
+# Category starts at test group 426.
 at_banner_text_29="test dir_name and base_name functions"
 # Banner 30. file_name.at:29
-# Category starts at test group 438.
+# Category starts at test group 439.
 at_banner_text_30="test follow_symlinks function"
 # Banner 31. aes128.at:1
-# Category starts at test group 446.
+# Category starts at test group 447.
 at_banner_text_31="AES-128 unit tests"
 # Banner 32. unixctl-py.at:1
-# Category starts at test group 469.
+# Category starts at test group 470.
 at_banner_text_32="unixctl"
 # Banner 33. uuid.at:1
-# Category starts at test group 475.
+# Category starts at test group 476.
 at_banner_text_33="UUID unit tests"
 # Banner 34. json.at:63
-# Category starts at test group 476.
+# Category starts at test group 477.
 at_banner_text_34="JSON -- arrays"
 # Banner 35. json.at:78
-# Category starts at test group 490.
+# Category starts at test group 491.
 at_banner_text_35="JSON -- strings"
 # Banner 36. json.at:147
-# Category starts at test group 524.
+# Category starts at test group 525.
 at_banner_text_36="JSON -- objects"
 # Banner 37. json.at:169
-# Category starts at test group 540.
+# Category starts at test group 541.
 at_banner_text_37="JSON -- literal names"
 # Banner 38. json.at:183
-# Category starts at test group 554.
+# Category starts at test group 555.
 at_banner_text_38="JSON -- numbers"
 # Banner 39. json.at:276
-# Category starts at test group 592.
+# Category starts at test group 593.
 at_banner_text_39="JSON -- RFC 4627 examples"
 # Banner 40. json.at:319
-# Category starts at test group 596.
+# Category starts at test group 597.
 at_banner_text_40="JSON -- pathological cases"
 # Banner 41. json.at:342
-# Category starts at test group 607.
+# Category starts at test group 608.
 at_banner_text_41="JSON -- multiple inputs"
 # Banner 42. jsonrpc.at:1
-# Category starts at test group 619.
+# Category starts at test group 620.
 at_banner_text_42="JSON-RPC - C"
 # Banner 43. jsonrpc-py.at:1
-# Category starts at test group 622.
+# Category starts at test group 623.
 at_banner_text_43="JSON-RPC - Python"
 # Banner 44. tunnel.at:1
-# Category starts at test group 625.
+# Category starts at test group 626.
 at_banner_text_44="tunnel"
 # Banner 45. tunnel-push-pop.at:1
-# Category starts at test group 637.
+# Category starts at test group 638.
 at_banner_text_45="tunnel_push_pop"
 # Banner 46. lockfile.at:1
-# Category starts at test group 638.
+# Category starts at test group 639.
 at_banner_text_46="lockfile unit tests"
 # Banner 47. reconnect.at:1
-# Category starts at test group 648.
+# Category starts at test group 649.
 at_banner_text_47="reconnect library"
 # Banner 48. ovs-vswitchd.at:1
-# Category starts at test group 672.
+# Category starts at test group 673.
 at_banner_text_48="ovs-vswitchd"
 # Banner 49. ofproto.at:1
-# Category starts at test group 677.
+# Category starts at test group 679.
 at_banner_text_49="ofproto"
 # Banner 50. dpif-netdev.at:1
-# Category starts at test group 779.
+# Category starts at test group 781.
 at_banner_text_50="dpif-netdev"
 # Banner 51. dpctl.at:1
-# Category starts at test group 782.
+# Category starts at test group 784.
 at_banner_text_51="dpctl"
 # Banner 52. ofproto-dpif.at:1
-# Category starts at test group 784.
+# Category starts at test group 786.
 at_banner_text_52="ofproto-dpif"
-# Banner 53. ofproto-dpif.at:5688
-# Category starts at test group 884.
+# Banner 53. ofproto-dpif.at:5687
+# Category starts at test group 886.
 at_banner_text_53="ofproto-dpif -- megaflows"
-# Banner 54. ofproto-dpif.at:6362
-# Category starts at test group 912.
+# Banner 54. ofproto-dpif.at:6361
+# Category starts at test group 914.
 at_banner_text_54="ofproto-dpif - flow translation resource limits"
 # Banner 55. bridge.at:1
-# Category starts at test group 923.
+# Category starts at test group 926.
 at_banner_text_55="bridge"
 # Banner 56. vlan-splinters.at:1
-# Category starts at test group 924.
+# Category starts at test group 927.
 at_banner_text_56="VLAN splinters"
 # Banner 57. ovsdb-log.at:1
-# Category starts at test group 925.
+# Category starts at test group 928.
 at_banner_text_57="OVSDB -- logging"
 # Banner 58. ovsdb-types.at:1
-# Category starts at test group 936.
+# Category starts at test group 939.
 at_banner_text_58="OVSDB -- atomic types"
 # Banner 59. ovsdb-types.at:16
-# Category starts at test group 948.
+# Category starts at test group 951.
 at_banner_text_59="OVSDB -- base types"
 # Banner 60. ovsdb-types.at:90
-# Category starts at test group 994.
+# Category starts at test group 997.
 at_banner_text_60="OVSDB -- simple types"
 # Banner 61. ovsdb-types.at:112
-# Category starts at test group 1012.
+# Category starts at test group 1015.
 at_banner_text_61="OVSDB -- set types"
 # Banner 62. ovsdb-types.at:144
-# Category starts at test group 1030.
+# Category starts at test group 1033.
 at_banner_text_62="OVSDB -- map types"
 # Banner 63. ovsdb-data.at:1
-# Category starts at test group 1044.
+# Category starts at test group 1047.
 at_banner_text_63="OVSDB -- default values"
 # Banner 64. ovsdb-data.at:74
-# Category starts at test group 1048.
+# Category starts at test group 1051.
 at_banner_text_64="OVSDB -- atoms without constraints"
 # Banner 65. ovsdb-data.at:301
-# Category starts at test group 1092.
+# Category starts at test group 1095.
 at_banner_text_65="OVSDB -- atoms with enum constraints"
 # Banner 66. ovsdb-data.at:374
-# Category starts at test group 1102.
+# Category starts at test group 1105.
 at_banner_text_66="OVSDB -- atoms with other constraints"
 # Banner 67. ovsdb-data.at:497
-# Category starts at test group 1118.
+# Category starts at test group 1121.
 at_banner_text_67="OSVDB -- simple data"
 # Banner 68. ovsdb-data.at:547
-# Category starts at test group 1130.
+# Category starts at test group 1133.
 at_banner_text_68="OVSDB -- set data"
 # Banner 69. ovsdb-data.at:691
-# Category starts at test group 1157.
+# Category starts at test group 1160.
 at_banner_text_69="OVSDB -- map data"
 # Banner 70. ovsdb-column.at:1
-# Category starts at test group 1175.
+# Category starts at test group 1178.
 at_banner_text_70="OVSDB -- columns"
 # Banner 71. ovsdb-table.at:1
-# Category starts at test group 1181.
+# Category starts at test group 1184.
 at_banner_text_71="OVSDB -- tables"
 # Banner 72. ovsdb-row.at:1
-# Category starts at test group 1209.
+# Category starts at test group 1212.
 at_banner_text_72="OVSDB -- rows"
 # Banner 73. ovsdb-schema.at:1
-# Category starts at test group 1220.
+# Category starts at test group 1223.
 at_banner_text_73="OVSDB -- schemas"
 # Banner 74. ovsdb-condition.at:1
-# Category starts at test group 1230.
+# Category starts at test group 1233.
 at_banner_text_74="OVSDB -- conditions"
 # Banner 75. ovsdb-mutation.at:1
-# Category starts at test group 1247.
+# Category starts at test group 1250.
 at_banner_text_75="OVSDB -- mutations"
 # Banner 76. ovsdb-query.at:1
-# Category starts at test group 1266.
+# Category starts at test group 1269.
 at_banner_text_76="OVSDB -- queries"
 # Banner 77. ovsdb-transaction.at:1
-# Category starts at test group 1273.
+# Category starts at test group 1276.
 at_banner_text_77="OVSDB -- transactions"
 # Banner 78. ovsdb-execution.at:1
-# Category starts at test group 1288.
+# Category starts at test group 1291.
 at_banner_text_78="OVSDB -- execution"
 # Banner 79. ovsdb-trigger.at:1
-# Category starts at test group 1316.
+# Category starts at test group 1319.
 at_banner_text_79="OVSDB -- triggers"
 # Banner 80. ovsdb-tool.at:1
-# Category starts at test group 1321.
+# Category starts at test group 1324.
 at_banner_text_80="OVSDB -- ovsdb-tool"
 # Banner 81. ovsdb-server.at:1
-# Category starts at test group 1356.
+# Category starts at test group 1359.
 at_banner_text_81="OVSDB -- ovsdb-server transactions (Unix sockets)"
 # Banner 82. ovsdb-server.at:41
-# Category starts at test group 1381.
+# Category starts at test group 1384.
 at_banner_text_82="ovsdb-server miscellaneous features"
 # Banner 83. ovsdb-server.at:795
-# Category starts at test group 1395.
+# Category starts at test group 1398.
 at_banner_text_83="OVSDB -- ovsdb-server transactions (SSL IPv4 sockets)"
 # Banner 84. ovsdb-server.at:834
-# Category starts at test group 1420.
+# Category starts at test group 1423.
 at_banner_text_84="OVSDB -- ovsdb-server transactions (SSL IPv6 sockets)"
 # Banner 85. ovsdb-server.at:873
-# Category starts at test group 1421.
+# Category starts at test group 1424.
 at_banner_text_85="OVSDB -- ovsdb-server transactions (TCP IPv4 sockets)"
 # Banner 86. ovsdb-server.at:923
-# Category starts at test group 1447.
+# Category starts at test group 1450.
 at_banner_text_86="OVSDB -- ovsdb-server transactions (TCP IPv6 sockets)"
 # Banner 87. ovsdb-server.at:961
-# Category starts at test group 1448.
+# Category starts at test group 1451.
 at_banner_text_87="OVSDB -- transactions on transient ovsdb-server"
 # Banner 88. ovsdb-monitor.at:1
-# Category starts at test group 1473.
+# Category starts at test group 1476.
 at_banner_text_88="OVSDB -- ovsdb-server monitors"
 # Banner 89. ovsdb-monitor.at:255
-# Category starts at test group 1482.
+# Category starts at test group 1485.
 at_banner_text_89="ovsdb -- ovsdb-monitor monitor only some operations"
 # Banner 90. ovsdb-idl.at:1
-# Category starts at test group 1487.
+# Category starts at test group 1490.
 at_banner_text_90="OVSDB -- interface description language (IDL)"
 # Banner 91. ovs-vsctl.at:143
-# Category starts at test group 1539.
+# Category starts at test group 1542.
 at_banner_text_91="ovs-vsctl unit tests"
 # Banner 92. ovs-vsctl.at:189
-# Category starts at test group 1540.
+# Category starts at test group 1543.
 at_banner_text_92="ovs-vsctl unit tests -- real bridges"
 # Banner 93. ovs-vsctl.at:559
-# Category starts at test group 1553.
+# Category starts at test group 1556.
 at_banner_text_93="ovs-vsctl unit tests -- fake bridges (VLAN 9)"
 # Banner 94. ovs-vsctl.at:560
-# Category starts at test group 1558.
+# Category starts at test group 1561.
 at_banner_text_94="ovs-vsctl unit tests -- fake bridges (VLAN 0)"
 # Banner 95. ovs-vsctl.at:606
-# Category starts at test group 1566.
+# Category starts at test group 1569.
 at_banner_text_95="ovs-vsctl unit tests -- manager commands"
 # Banner 96. ovs-vsctl.at:632
-# Category starts at test group 1567.
+# Category starts at test group 1570.
 at_banner_text_96="ovs-vsctl unit tests -- database commands"
 # Banner 97. ovs-vsctl.at:1227
-# Category starts at test group 1576.
+# Category starts at test group 1579.
 at_banner_text_97="ovs-vsctl add-port -- reserved port names"
 # Banner 98. ovs-monitor-ipsec.at:1
-# Category starts at test group 1579.
+# Category starts at test group 1582.
 at_banner_text_98="ovs-monitor-ipsec"
 # Banner 99. ovs-xapi-sync.at:1
-# Category starts at test group 1580.
+# Category starts at test group 1583.
 at_banner_text_99="ovs-xapi-sync"
 # Banner 100. interface-reconfigure.at:695
-# Category starts at test group 1581.
+# Category starts at test group 1584.
 at_banner_text_100="interface-reconfigure"
 # Banner 101. stp.at:1
-# Category starts at test group 1586.
+# Category starts at test group 1589.
 at_banner_text_101="Spanning Tree Protocol unit tests"
 # Banner 102. rstp.at:1
-# Category starts at test group 1600.
+# Category starts at test group 1603.
 at_banner_text_102="Rapid Spanning Tree Protocol unit tests"
 # Banner 103. vlog.at:1
-# Category starts at test group 1607.
+# Category starts at test group 1610.
 at_banner_text_103="vlog"
 # Banner 104. vtep-ctl.at:134
-# Category starts at test group 1614.
+# Category starts at test group 1617.
 at_banner_text_104="vtep-ctl unit tests -- physical switch tests"
 # Banner 105. vtep-ctl.at:270
-# Category starts at test group 1624.
+# Category starts at test group 1627.
 at_banner_text_105="vtep-ctl unit tests -- logical switch tests"
 # Banner 106. vtep-ctl.at:324
-# Category starts at test group 1629.
+# Category starts at test group 1632.
 at_banner_text_106="vtep-ctl unit tests -- logical binding tests"
 # Banner 107. vtep-ctl.at:395
-# Category starts at test group 1632.
+# Category starts at test group 1635.
 at_banner_text_107="vtep-ctl unit tests -- MAC binding tests"
 # Banner 108. vtep-ctl.at:866
-# Category starts at test group 1646.
+# Category starts at test group 1649.
 at_banner_text_108="vtep-ctl unit tests -- manager commands"
 # Banner 109. auto-attach.at:1
-# Category starts at test group 1647.
+# Category starts at test group 1650.
 at_banner_text_109="auto-attach unit tests"
 
 # Take any -C into account.
@@ -3126,11 +3126,11 @@
 
 # Banners and logs.
 $as_echo "## ----------------------------- ##
-## openvswitch 2.4.0 test suite. ##
+## openvswitch 2.4.1 test suite. ##
 ## ----------------------------- ##"
 {
   $as_echo "## ----------------------------- ##
-## openvswitch 2.4.0 test suite. ##
+## openvswitch 2.4.1 test suite. ##
 ## ----------------------------- ##"
   echo
 
@@ -3468,6 +3468,8 @@
 s/ n_bytes=0,//
 s/ idle_age=[0-9]*,//
 s/ hard_age=[0-9]*,//
+s/dp_hash=0x[0-9a-f]*\//dp_hash=0x0\//
+s/recirc_id=0x[0-9a-f]*,/recirc_id=0x0,/
 '
 }
 
@@ -4930,7 +4932,7 @@
   $as_echo "Please send $at_msg and all information you think might help:
 
    To: 
-   Subject: [openvswitch 2.4.0] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+   Subject: [openvswitch 2.4.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
@@ -4965,7 +4967,7 @@
 $as_echo "$at_srcdir/completion.at:23: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "completion.at:23"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -4979,7 +4981,7 @@
 $as_echo "$at_srcdir/completion.at:23: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "completion.at:23"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -5001,7 +5003,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5016,7 +5018,7 @@
 $as_echo "$at_srcdir/completion.at:23: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "completion.at:23"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5031,7 +5033,7 @@
 $as_echo "$at_srcdir/completion.at:23: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "completion.at:23"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -5063,7 +5065,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5080,7 +5082,7 @@
 $as_echo "$at_srcdir/completion.at:23: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "completion.at:23"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5109,7 +5111,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5133,7 +5135,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5157,7 +5159,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5181,7 +5183,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5206,7 +5208,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5231,7 +5233,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5255,7 +5257,7 @@
 $as_echo "$at_srcdir/completion.at:66: ovs-ofctl monitor br0 --detach --no-chdir --pidfile"
 at_fn_check_prepare_trace "completion.at:66"
 ( $at_check_trace; ovs-ofctl monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5278,7 +5280,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5302,7 +5304,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5326,7 +5328,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5343,7 +5345,7 @@
 $as_echo "$at_srcdir/completion.at:80: ovs-appctl --target ovs-ofctl exit"
 at_fn_check_prepare_trace "completion.at:80"
 ( $at_check_trace; ovs-appctl --target ovs-ofctl exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5358,7 +5360,7 @@
 $as_echo "$at_srcdir/completion.at:81: check_logs "
 at_fn_check_prepare_trace "completion.at:81"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5373,7 +5375,7 @@
 $as_echo "$at_srcdir/completion.at:81: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "completion.at:81"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5388,7 +5390,7 @@
 $as_echo "$at_srcdir/completion.at:81: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "completion.at:81"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5425,7 +5427,7 @@
 $as_echo "$at_srcdir/completion.at:90: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "completion.at:90"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5439,7 +5441,7 @@
 $as_echo "$at_srcdir/completion.at:90: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "completion.at:90"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -5461,7 +5463,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5476,7 +5478,7 @@
 $as_echo "$at_srcdir/completion.at:90: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "completion.at:90"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5491,7 +5493,7 @@
 $as_echo "$at_srcdir/completion.at:90: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "completion.at:90"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -5523,7 +5525,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5540,7 +5542,7 @@
 $as_echo "$at_srcdir/completion.at:90: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy "
 at_fn_check_prepare_trace "completion.at:90"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5581,7 +5583,7 @@
 echo "${INPUT}" | grep -- "available completions for keyword" \
      | sed -e 's/^ *//g;s/ *$//g'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5603,7 +5605,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5624,7 +5626,7 @@
 $as_echo "$at_srcdir/completion.at:111: echo \"\$INPUT\" | sed -e '/./,\$!d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "completion.at:111"
 ( $at_check_trace; echo "$INPUT" | sed -e '/./,$!d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5661,7 +5663,7 @@
 echo "${INPUT}" | grep -- "available completions for keyword" \
      | sed -e 's/^ *//g;s/ *$//g'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5683,7 +5685,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5702,7 +5704,7 @@
 $as_echo "$at_srcdir/completion.at:131: echo \"\$INPUT\" | sed -e '/./,\$!d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "completion.at:131"
 ( $at_check_trace; echo "$INPUT" | sed -e '/./,$!d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5718,7 +5720,7 @@
 $as_echo "$at_srcdir/completion.at:135: check_logs "
 at_fn_check_prepare_trace "completion.at:135"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5733,7 +5735,7 @@
 $as_echo "$at_srcdir/completion.at:135: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "completion.at:135"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5748,7 +5750,7 @@
 $as_echo "$at_srcdir/completion.at:135: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "completion.at:135"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5785,7 +5787,7 @@
 $as_echo "$at_srcdir/completion.at:144: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "completion.at:144"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5799,7 +5801,7 @@
 $as_echo "$at_srcdir/completion.at:144: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "completion.at:144"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -5821,7 +5823,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5836,7 +5838,7 @@
 $as_echo "$at_srcdir/completion.at:144: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "completion.at:144"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5851,7 +5853,7 @@
 $as_echo "$at_srcdir/completion.at:144: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "completion.at:144"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -5883,7 +5885,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5902,7 +5904,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "completion.at:144"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy \
                    -- add-port br0 p1 -- set Interface p1 type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5931,7 +5933,7 @@
 echo "${INPUT}" | grep -- "available completions for keyword" \
      | sed -e 's/^ *//g;s/ *$//g'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5953,7 +5955,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5976,7 +5978,7 @@
 $as_echo "$at_srcdir/completion.at:165: echo \"\$INPUT\" | sed -e '/./,\$!d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "completion.at:165"
 ( $at_check_trace; echo "$INPUT" | sed -e '/./,$!d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -5992,7 +5994,7 @@
 $as_echo "$at_srcdir/completion.at:169: check_logs "
 at_fn_check_prepare_trace "completion.at:169"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6007,7 +6009,7 @@
 $as_echo "$at_srcdir/completion.at:169: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "completion.at:169"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6022,7 +6024,7 @@
 $as_echo "$at_srcdir/completion.at:169: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "completion.at:169"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6059,7 +6061,7 @@
 $as_echo "$at_srcdir/completion.at:178: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "completion.at:178"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6073,7 +6075,7 @@
 $as_echo "$at_srcdir/completion.at:178: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "completion.at:178"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -6095,7 +6097,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6110,7 +6112,7 @@
 $as_echo "$at_srcdir/completion.at:178: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "completion.at:178"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6125,7 +6127,7 @@
 $as_echo "$at_srcdir/completion.at:178: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "completion.at:178"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -6157,7 +6159,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6176,7 +6178,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "completion.at:178"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy \
                    -- add-port br0 p1 -- set Interface p1 type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6213,7 +6215,7 @@
 echo "${INPUT}" | grep -- "available completions for keyword" \
      | sed -e 's/^ *//g;s/ *$//g'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6235,7 +6237,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6267,7 +6269,7 @@
 echo "${INPUT}" | grep -- "available completions for keyword" \
      | sed -e 's/^ *//g;s/ *$//g'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6289,7 +6291,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6322,7 +6324,7 @@
 echo "${INPUT}" | grep -- "available completions for keyword" \
      | sed -e 's/^ *//g;s/ *$//g'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6344,7 +6346,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6365,7 +6367,7 @@
 $as_echo "$at_srcdir/completion.at:226: echo \"\$INPUT\" | sed -e '/./,\$!d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "completion.at:226"
 ( $at_check_trace; echo "$INPUT" | sed -e '/./,$!d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6394,7 +6396,7 @@
 echo "${INPUT}" | grep -- "available completions for keyword" \
      | sed -e 's/^ *//g;s/ *$//g'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6416,7 +6418,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6449,7 +6451,7 @@
 echo "${INPUT}" | grep -- "available completions for keyword" \
      | sed -e 's/^ *//g;s/ *$//g'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6471,7 +6473,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6489,7 +6491,7 @@
 $as_echo "$at_srcdir/completion.at:256: check_logs "
 at_fn_check_prepare_trace "completion.at:256"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6504,7 +6506,7 @@
 $as_echo "$at_srcdir/completion.at:256: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "completion.at:256"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6519,7 +6521,7 @@
 $as_echo "$at_srcdir/completion.at:256: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "completion.at:256"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6556,7 +6558,7 @@
 $as_echo "$at_srcdir/completion.at:265: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "completion.at:265"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6570,7 +6572,7 @@
 $as_echo "$at_srcdir/completion.at:265: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "completion.at:265"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -6592,7 +6594,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6607,7 +6609,7 @@
 $as_echo "$at_srcdir/completion.at:265: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "completion.at:265"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6622,7 +6624,7 @@
 $as_echo "$at_srcdir/completion.at:265: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "completion.at:265"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -6654,7 +6656,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6671,7 +6673,7 @@
 $as_echo "$at_srcdir/completion.at:265: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "completion.at:265"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6704,7 +6706,7 @@
 echo "${INPUT}" | grep -- "available completions for keyword" \
      | sed -e 's/^ *//g;s/ *$//g'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6726,7 +6728,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6745,7 +6747,7 @@
 $as_echo "$at_srcdir/completion.at:281: echo \"\$INPUT\" | sed -e '/./,\$!d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "completion.at:281"
 ( $at_check_trace; echo "$INPUT" | sed -e '/./,$!d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6761,7 +6763,7 @@
 $as_echo "$at_srcdir/completion.at:285: check_logs "
 at_fn_check_prepare_trace "completion.at:285"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6776,7 +6778,7 @@
 $as_echo "$at_srcdir/completion.at:285: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "completion.at:285"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6791,7 +6793,7 @@
 $as_echo "$at_srcdir/completion.at:285: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "completion.at:285"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6828,7 +6830,7 @@
 $as_echo "$at_srcdir/completion.at:291: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "completion.at:291"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6842,7 +6844,7 @@
 $as_echo "$at_srcdir/completion.at:291: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "completion.at:291"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -6864,7 +6866,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6879,7 +6881,7 @@
 $as_echo "$at_srcdir/completion.at:291: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "completion.at:291"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6894,7 +6896,7 @@
 $as_echo "$at_srcdir/completion.at:291: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "completion.at:291"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -6926,7 +6928,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6943,7 +6945,7 @@
 $as_echo "$at_srcdir/completion.at:291: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy "
 at_fn_check_prepare_trace "completion.at:291"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6962,7 +6964,7 @@
 $as_echo "$at_srcdir/completion.at:295: echo \"\$INPUT\" | sed -e 's/ \\t*\$//' | sed -e '/./,\$!d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "completion.at:295"
 ( $at_check_trace; echo "$INPUT" | sed -e 's/ \t*$//' | sed -e '/./,$!d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6978,7 +6980,7 @@
 $as_echo "$at_srcdir/completion.at:297: echo \"\$INPUT\" | sed -e 's/ \\t*\$//' | sed -e '/./!d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "completion.at:297"
 ( $at_check_trace; echo "$INPUT" | sed -e 's/ \t*$//' | sed -e '/./!d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -6999,7 +7001,7 @@
 $as_echo "$at_srcdir/completion.at:306: check_logs "
 at_fn_check_prepare_trace "completion.at:306"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7014,7 +7016,7 @@
 $as_echo "$at_srcdir/completion.at:306: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "completion.at:306"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7029,7 +7031,7 @@
 $as_echo "$at_srcdir/completion.at:306: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "completion.at:306"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7051,7 +7053,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7069,7 +7071,7 @@
 $as_echo "$at_srcdir/completion.at:307: echo \"\$INPUT\" | sed -e 's/ \\t*\$//' | sed -e '/./!d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "completion.at:307"
 ( $at_check_trace; echo "$INPUT" | sed -e 's/ \t*$//' | sed -e '/./!d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7090,7 +7092,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7108,7 +7110,7 @@
 $as_echo "$at_srcdir/completion.at:307: echo \"\$INPUT\" | sed -e 's/ \\t*\$//' | sed -e '/./!d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "completion.at:307"
 ( $at_check_trace; echo "$INPUT" | sed -e 's/ \t*$//' | sed -e '/./!d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7129,7 +7131,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7147,7 +7149,7 @@
 $as_echo "$at_srcdir/completion.at:307: echo \"\$INPUT\" | sed -e 's/ \\t*\$//' | sed -e '/./!d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "completion.at:307"
 ( $at_check_trace; echo "$INPUT" | sed -e 's/ \t*$//' | sed -e '/./!d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7170,7 +7172,7 @@
 ( $at_check_trace;
 echo "${INPUT}" | sed -e '1,/Available/d' | tail -n+2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7208,7 +7210,7 @@
 $as_echo "$at_srcdir/completion.at:345: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "completion.at:345"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7222,7 +7224,7 @@
 $as_echo "$at_srcdir/completion.at:345: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "completion.at:345"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -7244,7 +7246,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7259,7 +7261,7 @@
 $as_echo "$at_srcdir/completion.at:345: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "completion.at:345"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7274,7 +7276,7 @@
 $as_echo "$at_srcdir/completion.at:345: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "completion.at:345"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -7306,7 +7308,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7323,7 +7325,7 @@
 $as_echo "$at_srcdir/completion.at:345: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "completion.at:345"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7346,7 +7348,7 @@
 $as_echo "$at_srcdir/completion.at:351: ovs-vsctl-bashcomp.bash test \"--db=unix:\$OVS_RUNDIR/db.sock \""
 at_fn_check_prepare_dynamic "ovs-vsctl-bashcomp.bash test \"--db=unix:$OVS_RUNDIR/db.sock \"" "completion.at:351"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "--db=unix:$OVS_RUNDIR/db.sock "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7364,7 +7366,7 @@
 $as_echo "$at_srcdir/completion.at:356: ovs-vsctl-bashcomp.bash test \"\""
 at_fn_check_prepare_trace "completion.at:356"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test ""
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7383,7 +7385,7 @@
 $as_echo "$at_srcdir/completion.at:362: ovs-vsctl-bashcomp.bash test \"--dry-run \""
 at_fn_check_prepare_trace "completion.at:362"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "--dry-run "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7400,7 +7402,7 @@
 $as_echo "$at_srcdir/completion.at:366: ovs-vsctl-bashcomp.bash test \"--dry-run --pretty \""
 at_fn_check_prepare_trace "completion.at:366"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "--dry-run --pretty "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7423,7 +7425,7 @@
 $as_echo "$at_srcdir/completion.at:374: ovs-vsctl-bashcomp.bash test \"--may-exist \""
 at_fn_check_prepare_trace "completion.at:374"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "--may-exist "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7449,7 +7451,7 @@
 $as_echo "$at_srcdir/completion.at:385: ovs-vsctl-bashcomp.bash test \"set \""
 at_fn_check_prepare_trace "completion.at:385"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7471,7 +7473,7 @@
 $as_echo "$at_srcdir/completion.at:392: ovs-vsctl-bashcomp.bash test \"br-get-external-id br0 \""
 at_fn_check_prepare_trace "completion.at:392"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "br-get-external-id br0 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7493,7 +7495,7 @@
 $as_echo "$at_srcdir/completion.at:399: ovs-vsctl-bashcomp.bash test \"destroy Bridge \""
 at_fn_check_prepare_trace "completion.at:399"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "destroy Bridge "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7510,7 +7512,7 @@
 $as_echo "$at_srcdir/completion.at:403: ovs-vsctl-bashcomp.bash test \"destroy Bridge br0 \""
 at_fn_check_prepare_trace "completion.at:403"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "destroy Bridge br0 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7532,7 +7534,7 @@
 $as_echo "$at_srcdir/completion.at:410: ovs-vsctl-bashcomp.bash test \"set Bridge br0 \""
 at_fn_check_prepare_trace "completion.at:410"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set Bridge br0 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7552,7 +7554,7 @@
 $as_echo "$at_srcdir/completion.at:415: ovs-vsctl-bashcomp.bash test \"set Bridge br0 other_config:random_key=123 \""
 at_fn_check_prepare_trace "completion.at:415"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set Bridge br0 other_config:random_key=123 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7570,7 +7572,7 @@
 $as_echo "$at_srcdir/completion.at:420: check_logs "
 at_fn_check_prepare_trace "completion.at:420"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7585,7 +7587,7 @@
 $as_echo "$at_srcdir/completion.at:420: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "completion.at:420"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7600,7 +7602,7 @@
 $as_echo "$at_srcdir/completion.at:420: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "completion.at:420"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7637,7 +7639,7 @@
 $as_echo "$at_srcdir/completion.at:426: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "completion.at:426"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7651,7 +7653,7 @@
 $as_echo "$at_srcdir/completion.at:426: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "completion.at:426"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -7673,7 +7675,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7688,7 +7690,7 @@
 $as_echo "$at_srcdir/completion.at:426: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "completion.at:426"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7703,7 +7705,7 @@
 $as_echo "$at_srcdir/completion.at:426: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "completion.at:426"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -7735,7 +7737,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7772,7 +7774,7 @@
     add-port br1 br1p0 -- set Interface br1p0 type=dummy -- \
     add-port br1 br1p1 -- set Interface br1p1 type=dummy -- \
     add-port foo bar -- set Interface bar type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7804,7 +7806,7 @@
 $as_echo "$at_srcdir/completion.at:452: ovs-vsctl-bashcomp.bash test \"set \""
 at_fn_check_prepare_trace "completion.at:452"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7824,7 +7826,7 @@
 $as_echo "$at_srcdir/completion.at:457: ovs-vsctl-bashcomp.bash test \"set Open\""
 at_fn_check_prepare_trace "completion.at:457"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set Open"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7850,7 +7852,7 @@
 $as_echo "$at_srcdir/completion.at:468: ovs-vsctl-bashcomp.bash test \"set Open_vSwitch \""
 at_fn_check_prepare_trace "completion.at:468"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set Open_vSwitch "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7871,7 +7873,7 @@
 $as_echo "$at_srcdir/completion.at:474: ovs-vsctl-bashcomp.bash test \"set Bridge \""
 at_fn_check_prepare_trace "completion.at:474"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set Bridge "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7897,7 +7899,7 @@
 $as_echo "$at_srcdir/completion.at:485: ovs-vsctl-bashcomp.bash test \"br-to-vlan \""
 at_fn_check_prepare_trace "completion.at:485"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "br-to-vlan "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7918,7 +7920,7 @@
 $as_echo "$at_srcdir/completion.at:491: ovs-vsctl-bashcomp.bash test \"br-to-vlan --\""
 at_fn_check_prepare_trace "completion.at:491"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "br-to-vlan --"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7944,7 +7946,7 @@
 $as_echo "$at_srcdir/completion.at:502: ovs-vsctl-bashcomp.bash test \"port-to-br \""
 at_fn_check_prepare_trace "completion.at:502"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "port-to-br "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7966,7 +7968,7 @@
 $as_echo "$at_srcdir/completion.at:509: ovs-vsctl-bashcomp.bash test \"del-port br0 \""
 at_fn_check_prepare_trace "completion.at:509"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "del-port br0 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -7994,7 +7996,7 @@
 $as_echo "$at_srcdir/completion.at:522: ovs-vsctl-bashcomp.bash test \"iface-to-br \""
 at_fn_check_prepare_trace "completion.at:522"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "iface-to-br "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8019,7 +8021,7 @@
 $as_echo "$at_srcdir/completion.at:532: ovs-vsctl-bashcomp.bash test \"set-fail-mode br0 \""
 at_fn_check_prepare_trace "completion.at:532"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set-fail-mode br0 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8041,7 +8043,7 @@
 $as_echo "$at_srcdir/completion.at:541: ovs-vsctl-bashcomp.bash test \"br-set-external-id br0 \""
 at_fn_check_prepare_trace "completion.at:541"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "br-set-external-id br0 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8062,7 +8064,7 @@
 $as_echo "$at_srcdir/completion.at:547: ovs-vsctl-bashcomp.bash test \"br-set-external-id br0 test_key\""
 at_fn_check_prepare_trace "completion.at:547"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "br-set-external-id br0 test_key"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8084,7 +8086,7 @@
 $as_echo "$at_srcdir/completion.at:554: ovs-vsctl-bashcomp.bash test \"br-set-external-id br0 \""
 at_fn_check_prepare_trace "completion.at:554"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "br-set-external-id br0 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8104,7 +8106,7 @@
 $as_echo "$at_srcdir/completion.at:559: ovs-vsctl-bashcomp.bash test \"br-get-external-id br0 \""
 at_fn_check_prepare_trace "completion.at:559"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "br-get-external-id br0 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8130,7 +8132,7 @@
 $as_echo "$at_srcdir/completion.at:570: ovs-vsctl-bashcomp.bash test \"br-set-external-id br0 bridge-id test_value\""
 at_fn_check_prepare_trace "completion.at:570"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "br-set-external-id br0 bridge-id test_value"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8157,7 +8159,7 @@
 $as_echo "$at_srcdir/completion.at:582: ovs-vsctl-bashcomp.bash test \"clear Open_vSwitch \$UUID \""
 at_fn_check_prepare_dynamic "ovs-vsctl-bashcomp.bash test \"clear Open_vSwitch $UUID \"" "completion.at:582"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "clear Open_vSwitch $UUID "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8178,7 +8180,7 @@
 $as_echo "$at_srcdir/completion.at:588: ovs-vsctl-bashcomp.bash test \"clear Bridge br0 \""
 at_fn_check_prepare_trace "completion.at:588"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "clear Bridge br0 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8201,7 +8203,7 @@
 $as_echo "$at_srcdir/completion.at:596: ovs-vsctl-bashcomp.bash test \"clear Bridge br0 other_config \""
 at_fn_check_prepare_trace "completion.at:596"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "clear Bridge br0 other_config "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8227,7 +8229,7 @@
 $as_echo "$at_srcdir/completion.at:607: ovs-vsctl-bashcomp.bash test \"add Bridge br0 other_config random_key\""
 at_fn_check_prepare_trace "completion.at:607"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "add Bridge br0 other_config random_key"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8247,7 +8249,7 @@
 $as_echo "$at_srcdir/completion.at:612: ovs-vsctl-bashcomp.bash test \"add Bridge br0 other_config random_key=abc\""
 at_fn_check_prepare_trace "completion.at:612"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "add Bridge br0 other_config random_key=abc"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8269,7 +8271,7 @@
 $as_echo "$at_srcdir/completion.at:619: ovs-vsctl-bashcomp.bash test \"add Bridge br0 other_config ran\""
 at_fn_check_prepare_trace "completion.at:619"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "add Bridge br0 other_config ran"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8296,7 +8298,7 @@
 $as_echo "$at_srcdir/completion.at:631: ovs-vsctl-bashcomp.bash test \"set Bridge br0 \""
 at_fn_check_prepare_trace "completion.at:631"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set Bridge br0 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8316,7 +8318,7 @@
 $as_echo "$at_srcdir/completion.at:636: ovs-vsctl-bashcomp.bash test \"set Bridge br0 other\""
 at_fn_check_prepare_trace "completion.at:636"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set Bridge br0 other"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8338,7 +8340,7 @@
 $as_echo "$at_srcdir/completion.at:643: ovs-vsctl-bashcomp.bash test \"set Bridge br0 other_config:\""
 at_fn_check_prepare_trace "completion.at:643"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set Bridge br0 other_config:"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8359,7 +8361,7 @@
 $as_echo "$at_srcdir/completion.at:649: ovs-vsctl-bashcomp.bash test \"set Bridge br0 other_config:random_val1=12345\""
 at_fn_check_prepare_trace "completion.at:649"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set Bridge br0 other_config:random_val1=12345"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8385,7 +8387,7 @@
 $as_echo "$at_srcdir/completion.at:660: ovs-vsctl-bashcomp.bash test \"set-ssl priva\""
 at_fn_check_prepare_trace "completion.at:660"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set-ssl priva"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8405,7 +8407,7 @@
 $as_echo "$at_srcdir/completion.at:665: ovs-vsctl-bashcomp.bash test \"set-ssl private_key cer\""
 at_fn_check_prepare_trace "completion.at:665"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set-ssl private_key cer"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8430,7 +8432,7 @@
 $as_echo "$at_srcdir/completion.at:675: ovs-vsctl-bashcomp.bash test \"set-manager \""
 at_fn_check_prepare_trace "completion.at:675"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set-manager "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8451,7 +8453,7 @@
 $as_echo "$at_srcdir/completion.at:681: ovs-vsctl-bashcomp.bash test \"set-manager unix:test\""
 at_fn_check_prepare_trace "completion.at:681"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set-manager unix:test"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8473,7 +8475,7 @@
 $as_echo "$at_srcdir/completion.at:688: ovs-vsctl-bashcomp.bash test \"set-manager ssl:something\""
 at_fn_check_prepare_trace "completion.at:688"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set-manager ssl:something"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8496,7 +8498,7 @@
 $as_echo "$at_srcdir/completion.at:698: ovs-vsctl-bashcomp.bash test \"add-br \""
 at_fn_check_prepare_trace "completion.at:698"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "add-br "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8516,7 +8518,7 @@
 $as_echo "$at_srcdir/completion.at:705: ovs-vsctl-bashcomp.bash test \"add-br new-br\""
 at_fn_check_prepare_trace "completion.at:705"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "add-br new-br"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8540,7 +8542,7 @@
 $as_echo "$at_srcdir/completion.at:714: ovs-vsctl-bashcomp.bash test \"add-br new-br \""
 at_fn_check_prepare_trace "completion.at:714"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "add-br new-br "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8564,7 +8566,7 @@
 $as_echo "$at_srcdir/completion.at:723: ovs-vsctl-bashcomp.bash test \"add-port br0 new-port \""
 at_fn_check_prepare_trace "completion.at:723"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "add-port br0 new-port "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8591,7 +8593,7 @@
 $as_echo "$at_srcdir/completion.at:735: ovs-vsctl-bashcomp.bash test \"init -- \""
 at_fn_check_prepare_trace "completion.at:735"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "init -- "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8612,7 +8614,7 @@
 $as_echo "$at_srcdir/completion.at:741: ovs-vsctl-bashcomp.bash test \"add-port br0 newp1 -- add-port br1 newp2 -- set Port \""
 at_fn_check_prepare_trace "completion.at:741"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "add-port br0 newp1 -- add-port br1 newp2 -- set Port "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8630,7 +8632,7 @@
 $as_echo "$at_srcdir/completion.at:746: check_logs "
 at_fn_check_prepare_trace "completion.at:746"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8645,7 +8647,7 @@
 $as_echo "$at_srcdir/completion.at:746: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "completion.at:746"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8660,7 +8662,7 @@
 $as_echo "$at_srcdir/completion.at:746: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "completion.at:746"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8697,7 +8699,7 @@
 $as_echo "$at_srcdir/completion.at:752: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "completion.at:752"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8711,7 +8713,7 @@
 $as_echo "$at_srcdir/completion.at:752: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "completion.at:752"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -8733,7 +8735,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8748,7 +8750,7 @@
 $as_echo "$at_srcdir/completion.at:752: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "completion.at:752"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8763,7 +8765,7 @@
 $as_echo "$at_srcdir/completion.at:752: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "completion.at:752"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -8795,7 +8797,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8812,7 +8814,7 @@
 $as_echo "$at_srcdir/completion.at:752: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "completion.at:752"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8830,7 +8832,7 @@
 $as_echo "$at_srcdir/completion.at:755: ovs-vsctl-bashcomp.bash test \"invalid\""
 at_fn_check_prepare_trace "completion.at:755"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "invalid"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8849,7 +8851,7 @@
 $as_echo "$at_srcdir/completion.at:761: ovs-vsctl-bashcomp.bash test \"invalid argu\""
 at_fn_check_prepare_trace "completion.at:761"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "invalid argu"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8868,7 +8870,7 @@
 $as_echo "$at_srcdir/completion.at:767: ovs-vsctl-bashcomp.bash test \"set INVALID_\""
 at_fn_check_prepare_trace "completion.at:767"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set INVALID_"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8887,7 +8889,7 @@
 $as_echo "$at_srcdir/completion.at:773: ovs-vsctl-bashcomp.bash test \"set INVALID_TBL \""
 at_fn_check_prepare_trace "completion.at:773"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "set INVALID_TBL "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8908,7 +8910,7 @@
 $as_echo "$at_srcdir/completion.at:781: ovs-vsctl-bashcomp.bash test \"--db=wrongdb\""
 at_fn_check_prepare_trace "completion.at:781"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test "--db=wrongdb"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8924,7 +8926,7 @@
 $as_echo "$at_srcdir/completion.at:784: check_logs "
 at_fn_check_prepare_trace "completion.at:784"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8939,7 +8941,7 @@
 $as_echo "$at_srcdir/completion.at:784: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "completion.at:784"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8954,7 +8956,7 @@
 $as_echo "$at_srcdir/completion.at:784: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "completion.at:784"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -8970,7 +8972,7 @@
 $as_echo "$at_srcdir/completion.at:786: ovs-vsctl-bashcomp.bash test \"\""
 at_fn_check_prepare_trace "completion.at:786"
 ( $at_check_trace; ovs-vsctl-bashcomp.bash test ""
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9006,7 +9008,7 @@
 $as_echo "$at_srcdir/bfd.at:47: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bfd.at:47"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9020,7 +9022,7 @@
 $as_echo "$at_srcdir/bfd.at:47: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bfd.at:47"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -9042,7 +9044,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9057,7 +9059,7 @@
 $as_echo "$at_srcdir/bfd.at:47: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "bfd.at:47"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9072,7 +9074,7 @@
 $as_echo "$at_srcdir/bfd.at:47: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "bfd.at:47"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -9104,7 +9106,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9137,7 +9139,7 @@
        options:peer=p1 -- \
     set Interface p0 bfd:enable=true -- \
     set Interface p1 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9158,7 +9160,7 @@
 $as_echo "$at_srcdir/bfd.at:61: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:61"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9187,7 +9189,7 @@
 $as_echo "$at_srcdir/bfd.at:62: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:62"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9216,7 +9218,7 @@
 $as_echo "$at_srcdir/bfd.at:64:  ovs-vsctl set interface p0 bfd:enable=false"
 at_fn_check_prepare_trace "bfd.at:64"
 ( $at_check_trace;  ovs-vsctl set interface p0 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9233,7 +9235,7 @@
 $as_echo "$at_srcdir/bfd.at:66: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:66"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9262,7 +9264,7 @@
 $as_echo "$at_srcdir/bfd.at:68:  ovs-vsctl set interface p0 bfd:enable=true"
 at_fn_check_prepare_trace "bfd.at:68"
 ( $at_check_trace;  ovs-vsctl set interface p0 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9279,7 +9281,7 @@
 $as_echo "$at_srcdir/bfd.at:70: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:70"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9308,7 +9310,7 @@
 $as_echo "$at_srcdir/bfd.at:71: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:71"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9338,7 +9340,7 @@
 $as_echo "$at_srcdir/bfd.at:74: ovs-appctl bfd/show p0"
 at_fn_check_prepare_trace "bfd.at:74"
 ( $at_check_trace; ovs-appctl bfd/show p0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "no such bfd object
@@ -9358,7 +9360,7 @@
 $as_echo "$at_srcdir/bfd.at:79: ovs-appctl bfd/show p1"
 at_fn_check_prepare_trace "bfd.at:79"
 ( $at_check_trace; ovs-appctl bfd/show p1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "no such bfd object
@@ -9377,7 +9379,7 @@
 $as_echo "$at_srcdir/bfd.at:83: check_logs "
 at_fn_check_prepare_trace "bfd.at:83"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9392,7 +9394,7 @@
 $as_echo "$at_srcdir/bfd.at:83: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "bfd.at:83"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9407,7 +9409,7 @@
 $as_echo "$at_srcdir/bfd.at:83: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "bfd.at:83"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9446,7 +9448,7 @@
 $as_echo "$at_srcdir/bfd.at:93: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bfd.at:93"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9460,7 +9462,7 @@
 $as_echo "$at_srcdir/bfd.at:93: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bfd.at:93"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -9482,7 +9484,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9497,7 +9499,7 @@
 $as_echo "$at_srcdir/bfd.at:93: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "bfd.at:93"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9512,7 +9514,7 @@
 $as_echo "$at_srcdir/bfd.at:93: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "bfd.at:93"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -9544,7 +9546,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9593,7 +9595,7 @@
        options:peer=p1-sw bfd:enable=true -- \
     add-port br-bfd0 p0 -- set Interface p0 type=patch \
        options:peer=p0-sw bfd:enable=true --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9614,7 +9616,7 @@
 $as_echo "$at_srcdir/bfd.at:116: ovs-ofctl add-flow br-sw 'priority=0,actions=NORMAL'"
 at_fn_check_prepare_trace "bfd.at:116"
 ( $at_check_trace; ovs-ofctl add-flow br-sw 'priority=0,actions=NORMAL'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9632,7 +9634,7 @@
 $as_echo "$at_srcdir/bfd.at:119: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:119"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9661,7 +9663,7 @@
 $as_echo "$at_srcdir/bfd.at:120: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:120"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9691,7 +9693,7 @@
 $as_echo "$at_srcdir/bfd.at:123:  ovs-ofctl add-flow br-sw 'priority=5,actions=drop' "
 at_fn_check_prepare_trace "bfd.at:123"
 ( $at_check_trace;  ovs-ofctl add-flow br-sw 'priority=5,actions=drop'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9708,7 +9710,7 @@
 $as_echo "$at_srcdir/bfd.at:125: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:125"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9737,7 +9739,7 @@
 $as_echo "$at_srcdir/bfd.at:126: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:126"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9767,7 +9769,7 @@
 $as_echo "$at_srcdir/bfd.at:129: ovs-ofctl del-flows br-sw"
 at_fn_check_prepare_trace "bfd.at:129"
 ( $at_check_trace; ovs-ofctl del-flows br-sw
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9782,7 +9784,7 @@
 $as_echo "$at_srcdir/bfd.at:130: ovs-ofctl add-flow br-sw 'priority=0,actions=NORMAL'"
 at_fn_check_prepare_trace "bfd.at:130"
 ( $at_check_trace; ovs-ofctl add-flow br-sw 'priority=0,actions=NORMAL'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9801,7 +9803,7 @@
 $as_echo "$at_srcdir/bfd.at:134: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:134"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9830,7 +9832,7 @@
 $as_echo "$at_srcdir/bfd.at:135: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:135"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9866,7 +9868,7 @@
 $as_echo "$at_srcdir/bfd.at:144:  ovs-ofctl add-flow br-sw 'in_port=1,priority=5,actions=drop'"
 at_fn_check_prepare_trace "bfd.at:144"
 ( $at_check_trace;  ovs-ofctl add-flow br-sw 'in_port=1,priority=5,actions=drop'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9884,7 +9886,7 @@
 $as_echo "$at_srcdir/bfd.at:147: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:147"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9916,7 +9918,7 @@
 $as_echo "$at_srcdir/bfd.at:151: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:151"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9945,7 +9947,7 @@
 $as_echo "$at_srcdir/bfd.at:153: ovs-ofctl del-flows br-sw"
 at_fn_check_prepare_trace "bfd.at:153"
 ( $at_check_trace; ovs-ofctl del-flows br-sw
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9960,7 +9962,7 @@
 $as_echo "$at_srcdir/bfd.at:154: ovs-ofctl add-flow br-sw 'priority=0,actions=NORMAL'"
 at_fn_check_prepare_trace "bfd.at:154"
 ( $at_check_trace; ovs-ofctl add-flow br-sw 'priority=0,actions=NORMAL'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9979,7 +9981,7 @@
 $as_echo "$at_srcdir/bfd.at:159:  ovs-ofctl add-flow br-sw 'in_port=2,priority=5,actions=drop'"
 at_fn_check_prepare_trace "bfd.at:159"
 ( $at_check_trace;  ovs-ofctl add-flow br-sw 'in_port=2,priority=5,actions=drop'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -9996,7 +9998,7 @@
 $as_echo "$at_srcdir/bfd.at:161: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:161"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10026,7 +10028,7 @@
 $as_echo "$at_srcdir/bfd.at:163: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:163"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10054,7 +10056,7 @@
 $as_echo "$at_srcdir/bfd.at:164: check_logs "
 at_fn_check_prepare_trace "bfd.at:164"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10069,7 +10071,7 @@
 $as_echo "$at_srcdir/bfd.at:164: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "bfd.at:164"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10084,7 +10086,7 @@
 $as_echo "$at_srcdir/bfd.at:164: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "bfd.at:164"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10119,7 +10121,7 @@
 $as_echo "$at_srcdir/bfd.at:170: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bfd.at:170"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10133,7 +10135,7 @@
 $as_echo "$at_srcdir/bfd.at:170: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bfd.at:170"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -10155,7 +10157,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10170,7 +10172,7 @@
 $as_echo "$at_srcdir/bfd.at:170: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "bfd.at:170"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10185,7 +10187,7 @@
 $as_echo "$at_srcdir/bfd.at:170: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "bfd.at:170"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -10217,7 +10219,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10234,7 +10236,7 @@
 $as_echo "$at_srcdir/bfd.at:170: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "bfd.at:170"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10255,7 +10257,7 @@
 ( $at_check_trace;  ovs-vsctl -- add-br br1 -- \
            set bridge br1 datapath-type=dummy \
            other-config:hwaddr=aa:55:aa:56:00:00
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10272,7 +10274,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "bfd.at:175"
 ( $at_check_trace;  ovs-vsctl -- add-port br1 p1 -- set Interface p1 type=patch \
            options:peer=p0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10289,7 +10291,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "bfd.at:177"
 ( $at_check_trace;  ovs-vsctl -- add-port br0 p0 -- set Interface p0 type=patch \
            options:peer=p1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10304,7 +10306,7 @@
 $as_echo "$at_srcdir/bfd.at:179:  ovs-vsctl -- set interface p0 bfd:enable=true "
 at_fn_check_prepare_trace "bfd.at:179"
 ( $at_check_trace;  ovs-vsctl -- set interface p0 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10319,7 +10321,7 @@
 $as_echo "$at_srcdir/bfd.at:180:  ovs-vsctl -- set interface p1 bfd:enable=true "
 at_fn_check_prepare_trace "bfd.at:180"
 ( $at_check_trace;  ovs-vsctl -- set interface p1 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10338,7 +10340,7 @@
 $as_echo "$at_srcdir/bfd.at:184: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:184"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10367,7 +10369,7 @@
 $as_echo "$at_srcdir/bfd.at:185: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:185"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10397,7 +10399,7 @@
 $as_echo "$at_srcdir/bfd.at:188: ovs-vsctl set interface p0 bfd:cpath_down=true"
 at_fn_check_prepare_trace "bfd.at:188"
 ( $at_check_trace; ovs-vsctl set interface p0 bfd:cpath_down=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10414,7 +10416,7 @@
 $as_echo "$at_srcdir/bfd.at:190: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:190"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10442,7 +10444,7 @@
 $as_echo "$at_srcdir/bfd.at:191: check_logs "
 at_fn_check_prepare_trace "bfd.at:191"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10457,7 +10459,7 @@
 $as_echo "$at_srcdir/bfd.at:191: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "bfd.at:191"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10472,7 +10474,7 @@
 $as_echo "$at_srcdir/bfd.at:191: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "bfd.at:191"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10507,7 +10509,7 @@
 $as_echo "$at_srcdir/bfd.at:197: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bfd.at:197"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10521,7 +10523,7 @@
 $as_echo "$at_srcdir/bfd.at:197: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bfd.at:197"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -10543,7 +10545,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10558,7 +10560,7 @@
 $as_echo "$at_srcdir/bfd.at:197: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "bfd.at:197"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10573,7 +10575,7 @@
 $as_echo "$at_srcdir/bfd.at:197: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "bfd.at:197"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -10605,7 +10607,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10622,7 +10624,7 @@
 $as_echo "$at_srcdir/bfd.at:197: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "bfd.at:197"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10641,7 +10643,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "bfd.at:199"
 ( $at_check_trace;  ovs-vsctl -- add-br br1 -- \
            set bridge br1 datapath-type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10658,7 +10660,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "bfd.at:201"
 ( $at_check_trace;  ovs-vsctl -- add-port br1 p1 -- set Interface p1 type=patch \
            options:peer=p0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10675,7 +10677,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "bfd.at:203"
 ( $at_check_trace;  ovs-vsctl -- add-port br0 p0 -- set Interface p0 type=patch \
            options:peer=p1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10690,7 +10692,7 @@
 $as_echo "$at_srcdir/bfd.at:205:  ovs-vsctl -- set interface p0 bfd:enable=true "
 at_fn_check_prepare_trace "bfd.at:205"
 ( $at_check_trace;  ovs-vsctl -- set interface p0 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10705,7 +10707,7 @@
 $as_echo "$at_srcdir/bfd.at:206:  ovs-vsctl -- set interface p1 bfd:enable=true "
 at_fn_check_prepare_trace "bfd.at:206"
 ( $at_check_trace;  ovs-vsctl -- set interface p1 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10723,7 +10725,7 @@
 $as_echo "$at_srcdir/bfd.at:209: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:209"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10752,7 +10754,7 @@
 $as_echo "$at_srcdir/bfd.at:210: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:210"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10781,7 +10783,7 @@
 $as_echo "$at_srcdir/bfd.at:212: ovs-vsctl set interface p0 bfd:min_tx=200"
 at_fn_check_prepare_trace "bfd.at:212"
 ( $at_check_trace; ovs-vsctl set interface p0 bfd:min_tx=200
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10798,7 +10800,7 @@
 $as_echo "$at_srcdir/bfd.at:214: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:214"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10819,7 +10821,7 @@
 $as_echo "$at_srcdir/bfd.at:215: ovs-appctl bfd/show p1 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:215"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10841,7 +10843,7 @@
 $as_echo "$at_srcdir/bfd.at:218: ovs-vsctl set interface p1 bfd:min_rx=300"
 at_fn_check_prepare_trace "bfd.at:218"
 ( $at_check_trace; ovs-vsctl set interface p1 bfd:min_rx=300
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10858,7 +10860,7 @@
 $as_echo "$at_srcdir/bfd.at:220: ovs-appctl bfd/show p1 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:220"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10879,7 +10881,7 @@
 $as_echo "$at_srcdir/bfd.at:221: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:221"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10900,7 +10902,7 @@
 $as_echo "$at_srcdir/bfd.at:223: check_logs "
 at_fn_check_prepare_trace "bfd.at:223"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10915,7 +10917,7 @@
 $as_echo "$at_srcdir/bfd.at:223: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "bfd.at:223"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10930,7 +10932,7 @@
 $as_echo "$at_srcdir/bfd.at:223: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "bfd.at:223"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10964,7 +10966,7 @@
 $as_echo "$at_srcdir/bfd.at:227: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bfd.at:227"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -10978,7 +10980,7 @@
 $as_echo "$at_srcdir/bfd.at:227: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bfd.at:227"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -11000,7 +11002,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11015,7 +11017,7 @@
 $as_echo "$at_srcdir/bfd.at:227: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "bfd.at:227"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11030,7 +11032,7 @@
 $as_echo "$at_srcdir/bfd.at:227: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "bfd.at:227"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -11062,7 +11064,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11085,7 +11087,7 @@
                     options:remote_ip=2.2.2.2 options:key=1 ofport_request=1 -- \
                     set interface p1 bfd:enable=true -- \
                     set bridge br0 fail-mode=standalone
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11103,7 +11105,7 @@
 $as_echo "$at_srcdir/bfd.at:233: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x1,src=2.2.2.2,dst=2.2.2.1,tos=0x0,ttl=64,tp_src=0,tp_dst=0,flags(key)),in_port(1),skb_mark(0/0),eth(src=00:11:22:33:44:55,dst=00:23:20:00:00:01),eth_type(0x0800),ipv4(src=169.254.1.0/0.0.0.0,dst=169.254.1.1/0.0.0.0,proto=17/0xff,tos=0/0,ttl=255/0,frag=no),udp(src=49152/0,dst=3784/0xffff)' -generate"
 at_fn_check_prepare_trace "bfd.at:233"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x1,src=2.2.2.2,dst=2.2.2.1,tos=0x0,ttl=64,tp_src=0,tp_dst=0,flags(key)),in_port(1),skb_mark(0/0),eth(src=00:11:22:33:44:55,dst=00:23:20:00:00:01),eth_type(0x0800),ipv4(src=169.254.1.0/0.0.0.0,dst=169.254.1.1/0.0.0.0,proto=17/0xff,tos=0/0,ttl=255/0,frag=no),udp(src=49152/0,dst=3784/0xffff)' -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11119,7 +11121,7 @@
 $as_echo "$at_srcdir/bfd.at:235: tail -2 stdout"
 at_fn_check_prepare_trace "bfd.at:235"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11139,7 +11141,7 @@
 $as_echo "$at_srcdir/bfd.at:241: ovs-vsctl set interface p1 bfd:check_tnl_key=true"
 at_fn_check_prepare_trace "bfd.at:241"
 ( $at_check_trace; ovs-vsctl set interface p1 bfd:check_tnl_key=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11154,7 +11156,7 @@
 $as_echo "$at_srcdir/bfd.at:242: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x1,src=2.2.2.2,dst=2.2.2.1,tos=0x0,ttl=64,tp_src=0,tp_dst=0,flags(key)),in_port(1),skb_mark(0/0),eth(src=00:11:22:33:44:55,dst=00:23:20:00:00:01),eth_type(0x0800),ipv4(src=169.254.1.0/0.0.0.0,dst=169.254.1.1/0.0.0.0,proto=17/0xff,tos=0/0,ttl=255/0,frag=no),udp(src=49152/0,dst=3784/0xffff)' -generate"
 at_fn_check_prepare_trace "bfd.at:242"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x1,src=2.2.2.2,dst=2.2.2.1,tos=0x0,ttl=64,tp_src=0,tp_dst=0,flags(key)),in_port(1),skb_mark(0/0),eth(src=00:11:22:33:44:55,dst=00:23:20:00:00:01),eth_type(0x0800),ipv4(src=169.254.1.0/0.0.0.0,dst=169.254.1.1/0.0.0.0,proto=17/0xff,tos=0/0,ttl=255/0,frag=no),udp(src=49152/0,dst=3784/0xffff)' -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11170,7 +11172,7 @@
 $as_echo "$at_srcdir/bfd.at:244: tail -1 stdout"
 at_fn_check_prepare_trace "bfd.at:244"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11189,7 +11191,7 @@
 $as_echo "$at_srcdir/bfd.at:249: ovs-vsctl set interface p1 options:key=0"
 at_fn_check_prepare_trace "bfd.at:249"
 ( $at_check_trace; ovs-vsctl set interface p1 options:key=0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11204,7 +11206,7 @@
 $as_echo "$at_srcdir/bfd.at:250: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x0,src=2.2.2.2,dst=2.2.2.1,tos=0x0,ttl=64,tp_src=0,tp_dst=0,flags(key)),in_port(1),skb_mark(0/0),eth(src=00:11:22:33:44:55,dst=00:23:20:00:00:01),eth_type(0x0800),ipv4(src=169.254.1.0/0.0.0.0,dst=169.254.1.1/0.0.0.0,proto=17/0xff,tos=0/0,ttl=255/0,frag=no),udp(src=49152/0,dst=3784/0xffff)' -generate"
 at_fn_check_prepare_trace "bfd.at:250"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x0,src=2.2.2.2,dst=2.2.2.1,tos=0x0,ttl=64,tp_src=0,tp_dst=0,flags(key)),in_port(1),skb_mark(0/0),eth(src=00:11:22:33:44:55,dst=00:23:20:00:00:01),eth_type(0x0800),ipv4(src=169.254.1.0/0.0.0.0,dst=169.254.1.1/0.0.0.0,proto=17/0xff,tos=0/0,ttl=255/0,frag=no),udp(src=49152/0,dst=3784/0xffff)' -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11220,7 +11222,7 @@
 $as_echo "$at_srcdir/bfd.at:252: tail -2 stdout"
 at_fn_check_prepare_trace "bfd.at:252"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11239,7 +11241,7 @@
 $as_echo "$at_srcdir/bfd.at:257: check_logs "
 at_fn_check_prepare_trace "bfd.at:257"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11254,7 +11256,7 @@
 $as_echo "$at_srcdir/bfd.at:257: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "bfd.at:257"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11269,7 +11271,7 @@
 $as_echo "$at_srcdir/bfd.at:257: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "bfd.at:257"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11303,7 +11305,7 @@
 $as_echo "$at_srcdir/bfd.at:262: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bfd.at:262"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11317,7 +11319,7 @@
 $as_echo "$at_srcdir/bfd.at:262: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bfd.at:262"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -11339,7 +11341,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11354,7 +11356,7 @@
 $as_echo "$at_srcdir/bfd.at:262: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "bfd.at:262"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11369,7 +11371,7 @@
 $as_echo "$at_srcdir/bfd.at:262: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "bfd.at:262"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -11401,7 +11403,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11430,7 +11432,7 @@
                     options:peer=p1 ofport_request=1 -- \
                     set Interface p0 bfd:enable=true bfd:min_tx=300 bfd:min_rx=300 -- \
                     set Interface p1 bfd:enable=true bfd:min_tx=500 bfd:min_rx=500
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11452,7 +11454,7 @@
 $as_echo "$at_srcdir/bfd.at:274: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:274"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11481,7 +11483,7 @@
 $as_echo "$at_srcdir/bfd.at:275: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:275"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11510,7 +11512,7 @@
 $as_echo "$at_srcdir/bfd.at:276: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:276"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11531,7 +11533,7 @@
 $as_echo "$at_srcdir/bfd.at:277: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:277"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11553,7 +11555,7 @@
 $as_echo "$at_srcdir/bfd.at:280: ovs-vsctl set interface p0 bfd:decay_min_rx=3000"
 at_fn_check_prepare_trace "bfd.at:280"
 ( $at_check_trace; ovs-vsctl set interface p0 bfd:decay_min_rx=3000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11572,7 +11574,7 @@
 $as_echo "$at_srcdir/bfd.at:284: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:284"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11593,7 +11595,7 @@
 $as_echo "$at_srcdir/bfd.at:285: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:285"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11618,7 +11620,7 @@
 $as_echo "$at_srcdir/bfd.at:290: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:290"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11639,7 +11641,7 @@
 $as_echo "$at_srcdir/bfd.at:291: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:291"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11663,7 +11665,7 @@
 $as_echo "$at_srcdir/bfd.at:295: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:295"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11692,7 +11694,7 @@
 $as_echo "$at_srcdir/bfd.at:296: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:296"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11721,7 +11723,7 @@
 $as_echo "$at_srcdir/bfd.at:297: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:297"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11742,7 +11744,7 @@
 $as_echo "$at_srcdir/bfd.at:298: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:298"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11770,7 +11772,7 @@
 $as_echo "$at_srcdir/bfd.at:307: ovs-ofctl packet-out br1 3 2  \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "bfd.at:307"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2  "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11789,7 +11791,7 @@
 $as_echo "$at_srcdir/bfd.at:312: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:312"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11810,7 +11812,7 @@
 $as_echo "$at_srcdir/bfd.at:313: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:313"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11835,7 +11837,7 @@
 $as_echo "$at_srcdir/bfd.at:319: ovs-vsctl set Interface p0 bfd:decay_min_rx=1000"
 at_fn_check_prepare_trace "bfd.at:319"
 ( $at_check_trace; ovs-vsctl set Interface p0 bfd:decay_min_rx=1000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11853,7 +11855,7 @@
 $as_echo "$at_srcdir/bfd.at:322: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:322"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11882,7 +11884,7 @@
 $as_echo "$at_srcdir/bfd.at:323: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:323"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11911,7 +11913,7 @@
 $as_echo "$at_srcdir/bfd.at:324: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:324"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11932,7 +11934,7 @@
 $as_echo "$at_srcdir/bfd.at:325: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:325"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11956,7 +11958,7 @@
 $as_echo "$at_srcdir/bfd.at:330: ovs-vsctl set Interface p0 bfd:decay_min_rx=0"
 at_fn_check_prepare_trace "bfd.at:330"
 ( $at_check_trace; ovs-vsctl set Interface p0 bfd:decay_min_rx=0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11975,7 +11977,7 @@
 $as_echo "$at_srcdir/bfd.at:334: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:334"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -11996,7 +11998,7 @@
 $as_echo "$at_srcdir/bfd.at:335: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:335"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12021,7 +12023,7 @@
 $as_echo "$at_srcdir/bfd.at:340: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:340"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12050,7 +12052,7 @@
 $as_echo "$at_srcdir/bfd.at:341: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:341"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12079,7 +12081,7 @@
 $as_echo "$at_srcdir/bfd.at:342: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:342"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12100,7 +12102,7 @@
 $as_echo "$at_srcdir/bfd.at:343: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:343"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12125,7 +12127,7 @@
 $as_echo "$at_srcdir/bfd.at:349: ovs-vsctl set Interface p0 bfd:decay_min_rx=3000 -- set interface p1 bfd:min_tx=5000"
 at_fn_check_prepare_trace "bfd.at:349"
 ( $at_check_trace; ovs-vsctl set Interface p0 bfd:decay_min_rx=3000 -- set interface p1 bfd:min_tx=5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12143,7 +12145,7 @@
 $as_echo "$at_srcdir/bfd.at:352: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:352"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12172,7 +12174,7 @@
 $as_echo "$at_srcdir/bfd.at:353: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:353"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12202,7 +12204,7 @@
 $as_echo "$at_srcdir/bfd.at:355: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:355"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12223,7 +12225,7 @@
 $as_echo "$at_srcdir/bfd.at:356: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:356"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12248,7 +12250,7 @@
 $as_echo "$at_srcdir/bfd.at:361: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:361"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12277,7 +12279,7 @@
 $as_echo "$at_srcdir/bfd.at:362: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:362"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12306,7 +12308,7 @@
 $as_echo "$at_srcdir/bfd.at:363: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:363"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12327,7 +12329,7 @@
 $as_echo "$at_srcdir/bfd.at:364: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:364"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12349,7 +12351,7 @@
 $as_echo "$at_srcdir/bfd.at:367: ovs-vsctl set Interface p1 bfd:min_tx=500"
 at_fn_check_prepare_trace "bfd.at:367"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:min_tx=500
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12368,7 +12370,7 @@
 $as_echo "$at_srcdir/bfd.at:371: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:371"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12389,7 +12391,7 @@
 $as_echo "$at_srcdir/bfd.at:372: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:372"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12414,7 +12416,7 @@
 $as_echo "$at_srcdir/bfd.at:378: ovs-vsctl set Interface p1 bfd:enable=false"
 at_fn_check_prepare_trace "bfd.at:378"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12433,7 +12435,7 @@
 $as_echo "$at_srcdir/bfd.at:382: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:382"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12462,7 +12464,7 @@
 $as_echo "$at_srcdir/bfd.at:383: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:383"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12483,7 +12485,7 @@
 $as_echo "$at_srcdir/bfd.at:384: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:384"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12505,7 +12507,7 @@
 $as_echo "$at_srcdir/bfd.at:387: ovs-vsctl set Interface p1 bfd:enable=true"
 at_fn_check_prepare_trace "bfd.at:387"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12522,7 +12524,7 @@
 $as_echo "$at_srcdir/bfd.at:389: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:389"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12543,7 +12545,7 @@
 $as_echo "$at_srcdir/bfd.at:390: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:390"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12567,7 +12569,7 @@
 $as_echo "$at_srcdir/bfd.at:394: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:394"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12588,7 +12590,7 @@
 $as_echo "$at_srcdir/bfd.at:395: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:395"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12610,7 +12612,7 @@
 $as_echo "$at_srcdir/bfd.at:398: check_logs "
 at_fn_check_prepare_trace "bfd.at:398"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12625,7 +12627,7 @@
 $as_echo "$at_srcdir/bfd.at:398: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "bfd.at:398"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12640,7 +12642,7 @@
 $as_echo "$at_srcdir/bfd.at:398: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "bfd.at:398"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12674,7 +12676,7 @@
 $as_echo "$at_srcdir/bfd.at:409: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bfd.at:409"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12688,7 +12690,7 @@
 $as_echo "$at_srcdir/bfd.at:409: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bfd.at:409"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -12710,7 +12712,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12725,7 +12727,7 @@
 $as_echo "$at_srcdir/bfd.at:409: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "bfd.at:409"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12740,7 +12742,7 @@
 $as_echo "$at_srcdir/bfd.at:409: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "bfd.at:409"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -12772,7 +12774,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12801,7 +12803,7 @@
                     options:peer=p1 ofport_request=1 -- \
                     set Interface p0 bfd:enable=true bfd:min_tx=500 bfd:min_rx=500 -- \
                     add-port br1 p2 -- set Interface p2 type=internal ofport_request=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12821,7 +12823,7 @@
 $as_echo "$at_srcdir/bfd.at:419: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:419"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12850,7 +12852,7 @@
 $as_echo "$at_srcdir/bfd.at:420: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:420"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12871,7 +12873,7 @@
 $as_echo "$at_srcdir/bfd.at:421: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:421"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12893,7 +12895,7 @@
 $as_echo "$at_srcdir/bfd.at:424: ovs-vsctl set Interface p0 bfd:forwarding_if_rx=true"
 at_fn_check_prepare_trace "bfd.at:424"
 ( $at_check_trace; ovs-vsctl set Interface p0 bfd:forwarding_if_rx=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12915,7 +12917,7 @@
 $as_echo "$at_srcdir/bfd.at:431: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:431"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12949,7 +12951,7 @@
 $as_echo "$at_srcdir/bfd.at:438: ovs-ofctl packet-out br1 3 2  \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "bfd.at:438"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2  "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12967,7 +12969,7 @@
 $as_echo "$at_srcdir/bfd.at:442: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:442"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -12996,7 +12998,7 @@
 $as_echo "$at_srcdir/bfd.at:444: ovs-vsctl del-br br1"
 at_fn_check_prepare_trace "bfd.at:444"
 ( $at_check_trace; ovs-vsctl del-br br1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13030,7 +13032,7 @@
 $as_echo "$at_srcdir/bfd.at:453: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bfd.at:453"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13044,7 +13046,7 @@
 $as_echo "$at_srcdir/bfd.at:453: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bfd.at:453"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -13066,7 +13068,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13081,7 +13083,7 @@
 $as_echo "$at_srcdir/bfd.at:453: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "bfd.at:453"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13096,7 +13098,7 @@
 $as_echo "$at_srcdir/bfd.at:453: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "bfd.at:453"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -13128,7 +13130,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13159,7 +13161,7 @@
                     set Interface p0 bfd:enable=true bfd:min_tx=500 bfd:min_rx=500 -- \
                     set Interface p1 bfd:enable=true bfd:min_tx=300 bfd:min_rx=300 -- \
                     add-port br1 p2 -- set Interface p2 type=internal ofport_request=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13181,7 +13183,7 @@
 $as_echo "$at_srcdir/bfd.at:467: ovs-vsctl set Interface p0 bfd:forwarding_if_rx=true"
 at_fn_check_prepare_trace "bfd.at:467"
 ( $at_check_trace; ovs-vsctl set Interface p0 bfd:forwarding_if_rx=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13203,7 +13205,7 @@
 $as_echo "$at_srcdir/bfd.at:474: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:474"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13234,7 +13236,7 @@
 $as_echo "$at_srcdir/bfd.at:478: ovs-vsctl set Interface p1 bfd:enable=false"
 at_fn_check_prepare_trace "bfd.at:478"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13255,7 +13257,7 @@
 $as_echo "$at_srcdir/bfd.at:484: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:484"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13285,7 +13287,7 @@
 $as_echo "$at_srcdir/bfd.at:487: ovs-ofctl packet-out br1 3 2  \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "bfd.at:487"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2  "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13307,7 +13309,7 @@
 $as_echo "$at_srcdir/bfd.at:495: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:495"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13337,7 +13339,7 @@
 $as_echo "$at_srcdir/bfd.at:498: ovs-vsctl set Interface p0 bfd:forwarding_if_rx=false"
 at_fn_check_prepare_trace "bfd.at:498"
 ( $at_check_trace; ovs-vsctl set Interface p0 bfd:forwarding_if_rx=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13354,7 +13356,7 @@
 $as_echo "$at_srcdir/bfd.at:500: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:500"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13384,7 +13386,7 @@
 $as_echo "$at_srcdir/bfd.at:503: ovs-vsctl set Interface p1 bfd:enable=true bfd:min_tx=300 bfd:min_rx=300"
 at_fn_check_prepare_trace "bfd.at:503"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:enable=true bfd:min_tx=300 bfd:min_rx=300
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13402,7 +13404,7 @@
 $as_echo "$at_srcdir/bfd.at:506: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:506"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13431,7 +13433,7 @@
 $as_echo "$at_srcdir/bfd.at:507: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:507"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13460,7 +13462,7 @@
 $as_echo "$at_srcdir/bfd.at:508: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:508"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13481,7 +13483,7 @@
 $as_echo "$at_srcdir/bfd.at:509: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:509"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13502,7 +13504,7 @@
 $as_echo "$at_srcdir/bfd.at:511: ovs-vsctl del-br br1"
 at_fn_check_prepare_trace "bfd.at:511"
 ( $at_check_trace; ovs-vsctl del-br br1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13536,7 +13538,7 @@
 $as_echo "$at_srcdir/bfd.at:518: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bfd.at:518"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13550,7 +13552,7 @@
 $as_echo "$at_srcdir/bfd.at:518: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bfd.at:518"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -13572,7 +13574,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13587,7 +13589,7 @@
 $as_echo "$at_srcdir/bfd.at:518: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "bfd.at:518"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13602,7 +13604,7 @@
 $as_echo "$at_srcdir/bfd.at:518: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "bfd.at:518"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -13634,7 +13636,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13663,7 +13665,7 @@
                     options:peer=p1 ofport_request=1 -- \
                     set Interface p0 bfd:enable=true bfd:min_tx=300 bfd:min_rx=300 bfd:decay_min_rx=3000 -- \
                     set Interface p1 bfd:enable=true bfd:min_tx=500 bfd:min_rx=500
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13684,7 +13686,7 @@
 $as_echo "$at_srcdir/bfd.at:529: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:529"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13713,7 +13715,7 @@
 $as_echo "$at_srcdir/bfd.at:530: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:530"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13742,7 +13744,7 @@
 $as_echo "$at_srcdir/bfd.at:531: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:531"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13763,7 +13765,7 @@
 $as_echo "$at_srcdir/bfd.at:532: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:532"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13785,7 +13787,7 @@
 $as_echo "$at_srcdir/bfd.at:535: ovs-vsctl set Interface p0 bfd:forwarding_if_rx=true"
 at_fn_check_prepare_trace "bfd.at:535"
 ( $at_check_trace; ovs-vsctl set Interface p0 bfd:forwarding_if_rx=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13807,7 +13809,7 @@
 $as_echo "$at_srcdir/bfd.at:542: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:542"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13838,7 +13840,7 @@
 $as_echo "$at_srcdir/bfd.at:546: ovs-vsctl set interface p0 bfd:decay_min_rx=1000"
 at_fn_check_prepare_trace "bfd.at:546"
 ( $at_check_trace; ovs-vsctl set interface p0 bfd:decay_min_rx=1000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13857,7 +13859,7 @@
 $as_echo "$at_srcdir/bfd.at:550: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:550"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13886,7 +13888,7 @@
 $as_echo "$at_srcdir/bfd.at:551: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:551"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13907,7 +13909,7 @@
 $as_echo "$at_srcdir/bfd.at:552: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:552"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13929,7 +13931,7 @@
 $as_echo "$at_srcdir/bfd.at:555: ovs-vsctl set Interface p1 bfd:enable=false"
 at_fn_check_prepare_trace "bfd.at:555"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13951,7 +13953,7 @@
 $as_echo "$at_srcdir/bfd.at:563: ovs-ofctl packet-out br1 3 2  \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "bfd.at:563"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2  "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -13968,7 +13970,7 @@
 $as_echo "$at_srcdir/bfd.at:566: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:566"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14000,7 +14002,7 @@
 $as_echo "$at_srcdir/bfd.at:571: ovs-ofctl packet-out br1 3 2  \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "bfd.at:571"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2  "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14018,7 +14020,7 @@
 $as_echo "$at_srcdir/bfd.at:575: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:575"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14051,7 +14053,7 @@
 $as_echo "$at_srcdir/bfd.at:580: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:580"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14081,7 +14083,7 @@
 $as_echo "$at_srcdir/bfd.at:583: ovs-vsctl set Interface p0 bfd:forwarding_if_rx=false"
 at_fn_check_prepare_trace "bfd.at:583"
 ( $at_check_trace; ovs-vsctl set Interface p0 bfd:forwarding_if_rx=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14097,7 +14099,7 @@
 $as_echo "$at_srcdir/bfd.at:584: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:584"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14126,7 +14128,7 @@
 $as_echo "$at_srcdir/bfd.at:586: ovs-vsctl set Interface p0 bfd:forwarding_if_rx=true"
 at_fn_check_prepare_trace "bfd.at:586"
 ( $at_check_trace; ovs-vsctl set Interface p0 bfd:forwarding_if_rx=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14142,7 +14144,7 @@
 $as_echo "$at_srcdir/bfd.at:587: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:587"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14172,7 +14174,7 @@
 $as_echo "$at_srcdir/bfd.at:590: ovs-vsctl set Interface p1 bfd:enable=true bfd:min_tx=300 bfd:min_rx=300"
 at_fn_check_prepare_trace "bfd.at:590"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:enable=true bfd:min_tx=300 bfd:min_rx=300
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14190,7 +14192,7 @@
 $as_echo "$at_srcdir/bfd.at:593: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:593"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14219,7 +14221,7 @@
 $as_echo "$at_srcdir/bfd.at:594: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:594"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14248,7 +14250,7 @@
 $as_echo "$at_srcdir/bfd.at:595: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:595"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14269,7 +14271,7 @@
 $as_echo "$at_srcdir/bfd.at:596: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:596"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14290,7 +14292,7 @@
 $as_echo "$at_srcdir/bfd.at:598: ovs-vsctl del-br br1"
 at_fn_check_prepare_trace "bfd.at:598"
 ( $at_check_trace; ovs-vsctl del-br br1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14324,7 +14326,7 @@
 $as_echo "$at_srcdir/bfd.at:605: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bfd.at:605"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14338,7 +14340,7 @@
 $as_echo "$at_srcdir/bfd.at:605: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bfd.at:605"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -14360,7 +14362,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14375,7 +14377,7 @@
 $as_echo "$at_srcdir/bfd.at:605: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "bfd.at:605"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14390,7 +14392,7 @@
 $as_echo "$at_srcdir/bfd.at:605: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "bfd.at:605"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -14422,7 +14424,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14451,7 +14453,7 @@
                     options:peer=p1 ofport_request=1 -- \
                     set Interface p0 bfd:enable=true bfd:min_tx=300 bfd:min_rx=300 bfd:forwarding_if_rx=true -- \
                     set Interface p1 bfd:enable=true bfd:min_tx=500 bfd:min_rx=500
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14472,7 +14474,7 @@
 $as_echo "$at_srcdir/bfd.at:616: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:616"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14501,7 +14503,7 @@
 $as_echo "$at_srcdir/bfd.at:617: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:617"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14530,7 +14532,7 @@
 $as_echo "$at_srcdir/bfd.at:618: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:618"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14552,7 +14554,7 @@
 $as_echo "$at_srcdir/bfd.at:621: ovs-vsctl set Interface p1 bfd:enable=false"
 at_fn_check_prepare_trace "bfd.at:621"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14574,7 +14576,7 @@
 $as_echo "$at_srcdir/bfd.at:629: ovs-ofctl packet-out br1 3 2  \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "bfd.at:629"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2  "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14591,7 +14593,7 @@
 $as_echo "$at_srcdir/bfd.at:632: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:632"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14626,7 +14628,7 @@
 $as_echo "$at_srcdir/bfd.at:640: ovs-ofctl packet-out br1 3 2  \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "bfd.at:640"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2  "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14643,7 +14645,7 @@
 $as_echo "$at_srcdir/bfd.at:643: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:643"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14673,7 +14675,7 @@
 $as_echo "$at_srcdir/bfd.at:646: ovs-vsctl set Interface p1 bfd:enable=true"
 at_fn_check_prepare_trace "bfd.at:646"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14691,7 +14693,7 @@
 $as_echo "$at_srcdir/bfd.at:649: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:649"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14720,7 +14722,7 @@
 $as_echo "$at_srcdir/bfd.at:650: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:650"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14749,7 +14751,7 @@
 $as_echo "$at_srcdir/bfd.at:651: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:651"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14771,7 +14773,7 @@
 $as_echo "$at_srcdir/bfd.at:654: ovs-vsctl set Interface p1 bfd:enable=false"
 at_fn_check_prepare_trace "bfd.at:654"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14792,7 +14794,7 @@
 $as_echo "$at_srcdir/bfd.at:661: ovs-ofctl packet-out br1 3 2  \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "bfd.at:661"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2  "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14809,7 +14811,7 @@
 $as_echo "$at_srcdir/bfd.at:664: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:664"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14838,7 +14840,7 @@
 $as_echo "$at_srcdir/bfd.at:666: ovs-vsctl del-br br1"
 at_fn_check_prepare_trace "bfd.at:666"
 ( $at_check_trace; ovs-vsctl del-br br1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14873,7 +14875,7 @@
 $as_echo "$at_srcdir/bfd.at:676: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bfd.at:676"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14887,7 +14889,7 @@
 $as_echo "$at_srcdir/bfd.at:676: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bfd.at:676"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -14909,7 +14911,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14924,7 +14926,7 @@
 $as_echo "$at_srcdir/bfd.at:676: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "bfd.at:676"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -14939,7 +14941,7 @@
 $as_echo "$at_srcdir/bfd.at:676: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "bfd.at:676"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -14971,7 +14973,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15004,7 +15006,7 @@
                     options:peer=p1 ofport_request=1 -- \
                     set Interface p0 bfd:enable=true bfd:min_tx=100 bfd:min_rx=100 -- \
                     set Interface p1 bfd:enable=true bfd:min_tx=100 bfd:min_rx=100
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15024,7 +15026,7 @@
 $as_echo "$at_srcdir/bfd.at:689: ovs-vsctl set Open_vSwitch . other_config:stats-update-interval=50000000"
 at_fn_check_prepare_trace "bfd.at:689"
 ( $at_check_trace; ovs-vsctl set Open_vSwitch . other_config:stats-update-interval=50000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15043,7 +15045,7 @@
 $as_echo "$at_srcdir/bfd.at:693: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:693"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15072,7 +15074,7 @@
 $as_echo "$at_srcdir/bfd.at:694: ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:694"
 ( $at_check_trace; ovs-appctl bfd/show p1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15101,7 +15103,7 @@
 $as_echo "$at_srcdir/bfd.at:695: ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:695"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/TX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15122,7 +15124,7 @@
 $as_echo "$at_srcdir/bfd.at:696: ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:696"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -n '/RX Interval/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15144,7 +15146,7 @@
 $as_echo "$at_srcdir/bfd.at:698: ovs-vsctl list interface p0 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:698"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15163,7 +15165,7 @@
 $as_echo "$at_srcdir/bfd.at:699: ovs-vsctl list interface p1 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:699"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15183,7 +15185,7 @@
 $as_echo "$at_srcdir/bfd.at:702: ovs-vsctl set interface p1 bfd:enable=false"
 at_fn_check_prepare_trace "bfd.at:702"
 ( $at_check_trace; ovs-vsctl set interface p1 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15200,7 +15202,7 @@
 $as_echo "$at_srcdir/bfd.at:704: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:704"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15229,7 +15231,7 @@
 $as_echo "$at_srcdir/bfd.at:705: ovs-vsctl list interface p0 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:705"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15247,7 +15249,7 @@
 $as_echo "$at_srcdir/bfd.at:706: ovs-vsctl list interface p1 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:706"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15265,7 +15267,7 @@
 $as_echo "$at_srcdir/bfd.at:710: ovs-vsctl set interface p1 bfd:enable=true"
 at_fn_check_prepare_trace "bfd.at:710"
 ( $at_check_trace; ovs-vsctl set interface p1 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15282,7 +15284,7 @@
 $as_echo "$at_srcdir/bfd.at:712: ovs-vsctl list interface p0 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:712"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15301,7 +15303,7 @@
 $as_echo "$at_srcdir/bfd.at:713: ovs-vsctl list interface p1 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:713"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15322,7 +15324,7 @@
 $as_echo "$at_srcdir/bfd.at:717: ovs-appctl bfd/set-forwarding p0 true"
 at_fn_check_prepare_trace "bfd.at:717"
 ( $at_check_trace; ovs-appctl bfd/set-forwarding p0 true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15341,7 +15343,7 @@
 $as_echo "$at_srcdir/bfd.at:722: ovs-vsctl set interface p1 bfd:enable=false"
 at_fn_check_prepare_trace "bfd.at:722"
 ( $at_check_trace; ovs-vsctl set interface p1 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15358,7 +15360,7 @@
 $as_echo "$at_srcdir/bfd.at:724: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:724"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15387,7 +15389,7 @@
 $as_echo "$at_srcdir/bfd.at:725: ovs-vsctl list interface p0 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:725"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15405,7 +15407,7 @@
 $as_echo "$at_srcdir/bfd.at:726: ovs-vsctl list interface p1 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:726"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15423,7 +15425,7 @@
 $as_echo "$at_srcdir/bfd.at:730: ovs-vsctl set interface p1 bfd:enable=true"
 at_fn_check_prepare_trace "bfd.at:730"
 ( $at_check_trace; ovs-vsctl set interface p1 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15440,7 +15442,7 @@
 $as_echo "$at_srcdir/bfd.at:732: ovs-vsctl list interface p0 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:732"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15459,7 +15461,7 @@
 $as_echo "$at_srcdir/bfd.at:733: ovs-vsctl list interface p1 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:733"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15479,7 +15481,7 @@
 $as_echo "$at_srcdir/bfd.at:736: ovs-appctl bfd/set-forwarding p0 normal"
 at_fn_check_prepare_trace "bfd.at:736"
 ( $at_check_trace; ovs-appctl bfd/set-forwarding p0 normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15498,7 +15500,7 @@
 $as_echo "$at_srcdir/bfd.at:741: ovs-vsctl set interface p1 bfd:enable=false"
 at_fn_check_prepare_trace "bfd.at:741"
 ( $at_check_trace; ovs-vsctl set interface p1 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15514,7 +15516,7 @@
 $as_echo "$at_srcdir/bfd.at:743: ovs-vsctl set interface p1 bfd:enable=true"
 at_fn_check_prepare_trace "bfd.at:743"
 ( $at_check_trace; ovs-vsctl set interface p1 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15531,7 +15533,7 @@
 $as_echo "$at_srcdir/bfd.at:745: ovs-vsctl list interface p0 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:745"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15550,7 +15552,7 @@
 $as_echo "$at_srcdir/bfd.at:746: ovs-vsctl list interface p1 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:746"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15570,7 +15572,7 @@
 $as_echo "$at_srcdir/bfd.at:749: ovs-vsctl set Interface p0 bfd:forwarding_if_rx=true"
 at_fn_check_prepare_trace "bfd.at:749"
 ( $at_check_trace; ovs-vsctl set Interface p0 bfd:forwarding_if_rx=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15587,7 +15589,7 @@
 $as_echo "$at_srcdir/bfd.at:752: ovs-vsctl set Interface p1 bfd:enable=false"
 at_fn_check_prepare_trace "bfd.at:752"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15609,7 +15611,7 @@
 $as_echo "$at_srcdir/bfd.at:760: ovs-ofctl packet-out br1 3 2 \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "bfd.at:760"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2 "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15626,7 +15628,7 @@
 $as_echo "$at_srcdir/bfd.at:763: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:763"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15656,7 +15658,7 @@
 $as_echo "$at_srcdir/bfd.at:765: ovs-vsctl list interface p0 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:765"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15679,7 +15681,7 @@
 $as_echo "$at_srcdir/bfd.at:770: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:770"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15708,7 +15710,7 @@
 $as_echo "$at_srcdir/bfd.at:771: ovs-vsctl list interface p0 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:771"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15731,7 +15733,7 @@
 $as_echo "$at_srcdir/bfd.at:777: ovs-ofctl packet-out br1 3 2 \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "bfd.at:777"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2 "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15749,7 +15751,7 @@
 $as_echo "$at_srcdir/bfd.at:781: ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:781"
 ( $at_check_trace; ovs-appctl bfd/show p0 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15778,7 +15780,7 @@
 $as_echo "$at_srcdir/bfd.at:782: ovs-vsctl list interface p0 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:782"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15798,7 +15800,7 @@
 $as_echo "$at_srcdir/bfd.at:785: ovs-vsctl set interface p1 bfd:enable=true"
 at_fn_check_prepare_trace "bfd.at:785"
 ( $at_check_trace; ovs-vsctl set interface p1 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15816,7 +15818,7 @@
 $as_echo "$at_srcdir/bfd.at:788: ovs-vsctl list interface p0 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:788"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15835,7 +15837,7 @@
 $as_echo "$at_srcdir/bfd.at:789: ovs-vsctl list interface p1 | sed -n \"s/^.*flap_count=\\(.*\\), forwarding.*\$/\\1/p\""
 at_fn_check_prepare_notrace 'a shell pipeline' "bfd.at:789"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n "s/^.*flap_count=\(.*\), forwarding.*$/\1/p"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15854,7 +15856,7 @@
 $as_echo "$at_srcdir/bfd.at:791: check_logs "
 at_fn_check_prepare_trace "bfd.at:791"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15869,7 +15871,7 @@
 $as_echo "$at_srcdir/bfd.at:791: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "bfd.at:791"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15884,7 +15886,7 @@
 $as_echo "$at_srcdir/bfd.at:791: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "bfd.at:791"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15918,7 +15920,7 @@
 $as_echo "$at_srcdir/cfm.at:50: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "cfm.at:50"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15932,7 +15934,7 @@
 $as_echo "$at_srcdir/cfm.at:50: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "cfm.at:50"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -15954,7 +15956,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15969,7 +15971,7 @@
 $as_echo "$at_srcdir/cfm.at:50: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "cfm.at:50"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -15984,7 +15986,7 @@
 $as_echo "$at_srcdir/cfm.at:50: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "cfm.at:50"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -16016,7 +16018,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16037,7 +16039,7 @@
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=gre \
                     options:remote_ip=1.2.3.4 -- \
                     set Interface p0 other_config:cfm_interval=300 other_config:cfm_extended=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16056,7 +16058,7 @@
 $as_echo "$at_srcdir/cfm.at:56: ovs-vsctl set Interface p0 cfm_mpid=1"
 at_fn_check_prepare_trace "cfm.at:56"
 ( $at_check_trace; ovs-vsctl set Interface p0 cfm_mpid=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16077,7 +16079,7 @@
 $as_echo "$at_srcdir/cfm.at:61: ovs-vsctl list interface p0 | sed -n '/cfm_fault /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:61"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_fault /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16096,7 +16098,7 @@
 $as_echo "$at_srcdir/cfm.at:61: ovs-vsctl list interface p0 | sed -n '/cfm_fault_status /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:61"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_fault_status /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16115,7 +16117,7 @@
 $as_echo "$at_srcdir/cfm.at:61: ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:61"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16134,7 +16136,7 @@
 $as_echo "$at_srcdir/cfm.at:61: ovs-vsctl list interface p0 | sed -n '/cfm_health /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:61"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_health /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16153,7 +16155,7 @@
 $as_echo "$at_srcdir/cfm.at:61: ovs-vsctl list interface p0 | sed -n '/cfm_remote_mpids /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:61"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_remote_mpids /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16172,7 +16174,7 @@
 $as_echo "$at_srcdir/cfm.at:61: ovs-vsctl list interface p0 | sed -n '/cfm_remote_opstate /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:61"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_remote_opstate /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16198,7 +16200,7 @@
 $as_echo "$at_srcdir/cfm.at:67: ovs-vsctl list interface p0 | sed -n '/cfm_fault /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:67"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_fault /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16217,7 +16219,7 @@
 $as_echo "$at_srcdir/cfm.at:67: ovs-vsctl list interface p0 | sed -n '/cfm_fault_status /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:67"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_fault_status /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16236,7 +16238,7 @@
 $as_echo "$at_srcdir/cfm.at:67: ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:67"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16255,7 +16257,7 @@
 $as_echo "$at_srcdir/cfm.at:67: ovs-vsctl list interface p0 | sed -n '/cfm_health /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:67"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_health /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16274,7 +16276,7 @@
 $as_echo "$at_srcdir/cfm.at:67: ovs-vsctl list interface p0 | sed -n '/cfm_remote_mpids /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:67"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_remote_mpids /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16293,7 +16295,7 @@
 $as_echo "$at_srcdir/cfm.at:67: ovs-vsctl list interface p0 | sed -n '/cfm_remote_opstate /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:67"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_remote_opstate /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16314,7 +16316,7 @@
 $as_echo "$at_srcdir/cfm.at:70: ovs-vsctl remove int p0 cfm_mpid 1"
 at_fn_check_prepare_trace "cfm.at:70"
 ( $at_check_trace; ovs-vsctl remove int p0 cfm_mpid 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16332,7 +16334,7 @@
 $as_echo "$at_srcdir/cfm.at:72: ovs-vsctl list interface p0 | sed -n '/cfm_fault /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:72"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_fault /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16351,7 +16353,7 @@
 $as_echo "$at_srcdir/cfm.at:72: ovs-vsctl list interface p0 | sed -n '/cfm_fault_status /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:72"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_fault_status /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16370,7 +16372,7 @@
 $as_echo "$at_srcdir/cfm.at:72: ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:72"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16389,7 +16391,7 @@
 $as_echo "$at_srcdir/cfm.at:72: ovs-vsctl list interface p0 | sed -n '/cfm_health /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:72"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_health /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16408,7 +16410,7 @@
 $as_echo "$at_srcdir/cfm.at:72: ovs-vsctl list interface p0 | sed -n '/cfm_remote_mpids /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:72"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_remote_mpids /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16427,7 +16429,7 @@
 $as_echo "$at_srcdir/cfm.at:72: ovs-vsctl list interface p0 | sed -n '/cfm_remote_opstate /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:72"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_remote_opstate /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16447,7 +16449,7 @@
 $as_echo "$at_srcdir/cfm.at:74: check_logs "
 at_fn_check_prepare_trace "cfm.at:74"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16462,7 +16464,7 @@
 $as_echo "$at_srcdir/cfm.at:74: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "cfm.at:74"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16477,7 +16479,7 @@
 $as_echo "$at_srcdir/cfm.at:74: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "cfm.at:74"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16512,7 +16514,7 @@
 $as_echo "$at_srcdir/cfm.at:80: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "cfm.at:80"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16526,7 +16528,7 @@
 $as_echo "$at_srcdir/cfm.at:80: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "cfm.at:80"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -16548,7 +16550,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16563,7 +16565,7 @@
 $as_echo "$at_srcdir/cfm.at:80: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "cfm.at:80"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16578,7 +16580,7 @@
 $as_echo "$at_srcdir/cfm.at:80: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "cfm.at:80"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -16610,7 +16612,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16643,7 +16645,7 @@
                     options:peer=p1 -- \
                     set Interface p0 other_config:cfm_interval=300 other_config:cfm_extended=true -- \
                     set Interface p1 other_config:cfm_interval=300 other_config:cfm_extended=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16662,7 +16664,7 @@
 $as_echo "$at_srcdir/cfm.at:92: ovs-vsctl set Interface p0 cfm_mpid=1"
 at_fn_check_prepare_trace "cfm.at:92"
 ( $at_check_trace; ovs-vsctl set Interface p0 cfm_mpid=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16681,7 +16683,7 @@
 $as_echo "$at_srcdir/cfm.at:95: ovs-vsctl list interface p0 | sed -n '/cfm_fault /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:95"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_fault /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16700,7 +16702,7 @@
 $as_echo "$at_srcdir/cfm.at:95: ovs-vsctl list interface p0 | sed -n '/cfm_fault_status /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:95"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_fault_status /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16719,7 +16721,7 @@
 $as_echo "$at_srcdir/cfm.at:95: ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:95"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16738,7 +16740,7 @@
 $as_echo "$at_srcdir/cfm.at:95: ovs-vsctl list interface p0 | sed -n '/cfm_health /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:95"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_health /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16757,7 +16759,7 @@
 $as_echo "$at_srcdir/cfm.at:95: ovs-vsctl list interface p0 | sed -n '/cfm_remote_mpids /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:95"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_remote_mpids /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16776,7 +16778,7 @@
 $as_echo "$at_srcdir/cfm.at:95: ovs-vsctl list interface p0 | sed -n '/cfm_remote_opstate /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:95"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_remote_opstate /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16797,7 +16799,7 @@
 $as_echo "$at_srcdir/cfm.at:98: ovs-vsctl set interface p1 cfm_mpid=2"
 at_fn_check_prepare_trace "cfm.at:98"
 ( $at_check_trace; ovs-vsctl set interface p1 cfm_mpid=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16815,7 +16817,7 @@
 $as_echo "$at_srcdir/cfm.at:100: ovs-vsctl list interface p0 | sed -n '/cfm_fault /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:100"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_fault /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16834,7 +16836,7 @@
 $as_echo "$at_srcdir/cfm.at:100: ovs-vsctl list interface p0 | sed -n '/cfm_fault_status /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:100"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_fault_status /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16853,7 +16855,7 @@
 $as_echo "$at_srcdir/cfm.at:100: ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:100"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16872,7 +16874,7 @@
 $as_echo "$at_srcdir/cfm.at:100: ovs-vsctl list interface p0 | sed -n '/cfm_health /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:100"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_health /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16891,7 +16893,7 @@
 $as_echo "$at_srcdir/cfm.at:100: ovs-vsctl list interface p0 | sed -n '/cfm_remote_mpids /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:100"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_remote_mpids /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16910,7 +16912,7 @@
 $as_echo "$at_srcdir/cfm.at:100: ovs-vsctl list interface p0 | sed -n '/cfm_remote_opstate /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:100"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_remote_opstate /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16931,7 +16933,7 @@
 $as_echo "$at_srcdir/cfm.at:101: ovs-vsctl list interface p1 | sed -n '/cfm_fault /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:101"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n '/cfm_fault /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16950,7 +16952,7 @@
 $as_echo "$at_srcdir/cfm.at:101: ovs-vsctl list interface p1 | sed -n '/cfm_fault_status /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:101"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n '/cfm_fault_status /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16969,7 +16971,7 @@
 $as_echo "$at_srcdir/cfm.at:101: ovs-vsctl list interface p1 | sed -n '/cfm_flap_count /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:101"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n '/cfm_flap_count /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -16988,7 +16990,7 @@
 $as_echo "$at_srcdir/cfm.at:101: ovs-vsctl list interface p1 | sed -n '/cfm_health /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:101"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n '/cfm_health /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17007,7 +17009,7 @@
 $as_echo "$at_srcdir/cfm.at:101: ovs-vsctl list interface p1 | sed -n '/cfm_remote_mpids /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:101"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n '/cfm_remote_mpids /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17026,7 +17028,7 @@
 $as_echo "$at_srcdir/cfm.at:101: ovs-vsctl list interface p1 | sed -n '/cfm_remote_opstate /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:101"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n '/cfm_remote_opstate /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17047,7 +17049,7 @@
 $as_echo "$at_srcdir/cfm.at:104: ovs-vsctl remove int p1 cfm_mpid 2"
 at_fn_check_prepare_trace "cfm.at:104"
 ( $at_check_trace; ovs-vsctl remove int p1 cfm_mpid 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17065,7 +17067,7 @@
 $as_echo "$at_srcdir/cfm.at:106: ovs-vsctl list interface p0 | sed -n '/cfm_fault /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:106"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_fault /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17084,7 +17086,7 @@
 $as_echo "$at_srcdir/cfm.at:106: ovs-vsctl list interface p0 | sed -n '/cfm_fault_status /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:106"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_fault_status /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17103,7 +17105,7 @@
 $as_echo "$at_srcdir/cfm.at:106: ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:106"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17122,7 +17124,7 @@
 $as_echo "$at_srcdir/cfm.at:106: ovs-vsctl list interface p0 | sed -n '/cfm_health /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:106"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_health /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17141,7 +17143,7 @@
 $as_echo "$at_srcdir/cfm.at:106: ovs-vsctl list interface p0 | sed -n '/cfm_remote_mpids /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:106"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_remote_mpids /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17160,7 +17162,7 @@
 $as_echo "$at_srcdir/cfm.at:106: ovs-vsctl list interface p0 | sed -n '/cfm_remote_opstate /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:106"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_remote_opstate /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17180,7 +17182,7 @@
 $as_echo "$at_srcdir/cfm.at:108: check_logs "
 at_fn_check_prepare_trace "cfm.at:108"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17195,7 +17197,7 @@
 $as_echo "$at_srcdir/cfm.at:108: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "cfm.at:108"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17210,7 +17212,7 @@
 $as_echo "$at_srcdir/cfm.at:108: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "cfm.at:108"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17245,7 +17247,7 @@
 $as_echo "$at_srcdir/cfm.at:114: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "cfm.at:114"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17259,7 +17261,7 @@
 $as_echo "$at_srcdir/cfm.at:114: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "cfm.at:114"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -17281,7 +17283,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17296,7 +17298,7 @@
 $as_echo "$at_srcdir/cfm.at:114: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "cfm.at:114"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17311,7 +17313,7 @@
 $as_echo "$at_srcdir/cfm.at:114: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "cfm.at:114"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -17343,7 +17345,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17376,7 +17378,7 @@
                     options:peer=p1 -- \
                     set Interface p0 cfm_mpid=1 other_config:cfm_interval=300 other_config:cfm_extended=true -- \
                     set Interface p1 cfm_mpid=2 other_config:cfm_interval=300 other_config:cfm_extended=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17397,7 +17399,7 @@
 $as_echo "$at_srcdir/cfm.at:127: ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:127"
 ( $at_check_trace; ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17423,7 +17425,7 @@
 $as_echo "$at_srcdir/cfm.at:128: ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:128"
 ( $at_check_trace; ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17450,7 +17452,7 @@
 $as_echo "$at_srcdir/cfm.at:131: ovs-vsctl set interface p0 other_config:cfm_demand=true"
 at_fn_check_prepare_trace "cfm.at:131"
 ( $at_check_trace; ovs-vsctl set interface p0 other_config:cfm_demand=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17471,7 +17473,7 @@
 $as_echo "$at_srcdir/cfm.at:137: ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:137"
 ( $at_check_trace; ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17497,7 +17499,7 @@
 $as_echo "$at_srcdir/cfm.at:138: ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:138"
 ( $at_check_trace; ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17525,7 +17527,7 @@
 $as_echo "$at_srcdir/cfm.at:142: ovs-vsctl set interface p1 other_config:cfm_demand=true"
 at_fn_check_prepare_trace "cfm.at:142"
 ( $at_check_trace; ovs-vsctl set interface p1 other_config:cfm_demand=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17544,7 +17546,7 @@
 $as_echo "$at_srcdir/cfm.at:146: ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:146"
 ( $at_check_trace; ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17570,7 +17572,7 @@
 $as_echo "$at_srcdir/cfm.at:147: ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:147"
 ( $at_check_trace; ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17597,7 +17599,7 @@
 $as_echo "$at_srcdir/cfm.at:150: check_logs "
 at_fn_check_prepare_trace "cfm.at:150"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17612,7 +17614,7 @@
 $as_echo "$at_srcdir/cfm.at:150: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "cfm.at:150"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17627,7 +17629,7 @@
 $as_echo "$at_srcdir/cfm.at:150: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "cfm.at:150"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17662,7 +17664,7 @@
 $as_echo "$at_srcdir/cfm.at:156: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "cfm.at:156"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17676,7 +17678,7 @@
 $as_echo "$at_srcdir/cfm.at:156: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "cfm.at:156"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -17698,7 +17700,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17713,7 +17715,7 @@
 $as_echo "$at_srcdir/cfm.at:156: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "cfm.at:156"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17728,7 +17730,7 @@
 $as_echo "$at_srcdir/cfm.at:156: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "cfm.at:156"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -17760,7 +17762,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17793,7 +17795,7 @@
                     options:peer=p1 ofport_request=1 -- \
                     set Interface p0 cfm_mpid=1 other_config:cfm_interval=300 other_config:cfm_extended=true other_config:cfm_demand=true -- \
                     set Interface p1 cfm_mpid=2 other_config:cfm_interval=300 other_config:cfm_extended=true other_config:cfm_demand=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17815,7 +17817,7 @@
 $as_echo "$at_srcdir/cfm.at:170: ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:170"
 ( $at_check_trace; ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17841,7 +17843,7 @@
 $as_echo "$at_srcdir/cfm.at:171: ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:171"
 ( $at_check_trace; ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17868,7 +17870,7 @@
 $as_echo "$at_srcdir/cfm.at:174: ovs-vsctl clear Interface p1 cfm_mpid"
 at_fn_check_prepare_trace "cfm.at:174"
 ( $at_check_trace; ovs-vsctl clear Interface p1 cfm_mpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17887,7 +17889,7 @@
 $as_echo "$at_srcdir/cfm.at:179: ovs-ofctl packet-out br1 3 2  \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "cfm.at:179"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2  "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17904,7 +17906,7 @@
 $as_echo "$at_srcdir/cfm.at:182: ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:182"
 ( $at_check_trace; ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17935,7 +17937,7 @@
 $as_echo "$at_srcdir/cfm.at:189: ovs-ofctl packet-out br1 3 2  \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "cfm.at:189"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2  "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17952,7 +17954,7 @@
 $as_echo "$at_srcdir/cfm.at:192: ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:192"
 ( $at_check_trace; ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17978,7 +17980,7 @@
 $as_echo "$at_srcdir/cfm.at:195: ovs-vsctl set Interface p1 cfm_mpid=2"
 at_fn_check_prepare_trace "cfm.at:195"
 ( $at_check_trace; ovs-vsctl set Interface p1 cfm_mpid=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -17996,7 +17998,7 @@
 $as_echo "$at_srcdir/cfm.at:198: ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:198"
 ( $at_check_trace; ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18022,7 +18024,7 @@
 $as_echo "$at_srcdir/cfm.at:199: ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:199"
 ( $at_check_trace; ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18049,7 +18051,7 @@
 $as_echo "$at_srcdir/cfm.at:202: ovs-vsctl clear Interface p1 cfm_mpid"
 at_fn_check_prepare_trace "cfm.at:202"
 ( $at_check_trace; ovs-vsctl clear Interface p1 cfm_mpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18068,7 +18070,7 @@
 $as_echo "$at_srcdir/cfm.at:207: ovs-ofctl packet-out br1 3 2  \"90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202\""
 at_fn_check_prepare_trace "cfm.at:207"
 ( $at_check_trace; ovs-ofctl packet-out br1 3 2  "90e2ba01475000101856b2e80806000108000604000100101856b2e80202020300000000000002020202"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18085,7 +18087,7 @@
 $as_echo "$at_srcdir/cfm.at:210: ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:210"
 ( $at_check_trace; ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18110,7 +18112,7 @@
 $as_echo "$at_srcdir/cfm.at:212: check_logs "
 at_fn_check_prepare_trace "cfm.at:212"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18125,7 +18127,7 @@
 $as_echo "$at_srcdir/cfm.at:212: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "cfm.at:212"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18140,7 +18142,7 @@
 $as_echo "$at_srcdir/cfm.at:212: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "cfm.at:212"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18175,7 +18177,7 @@
 $as_echo "$at_srcdir/cfm.at:218: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "cfm.at:218"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18189,7 +18191,7 @@
 $as_echo "$at_srcdir/cfm.at:218: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "cfm.at:218"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -18211,7 +18213,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18226,7 +18228,7 @@
 $as_echo "$at_srcdir/cfm.at:218: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "cfm.at:218"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18241,7 +18243,7 @@
 $as_echo "$at_srcdir/cfm.at:218: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "cfm.at:218"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -18273,7 +18275,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18306,7 +18308,7 @@
                     options:peer=p1 -- \
                     set Interface p0 cfm_mpid=1 other_config:cfm_interval=100 other_config:cfm_extended=true -- \
                     set Interface p1 cfm_mpid=2 other_config:cfm_interval=100 other_config:cfm_extended=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18328,7 +18330,7 @@
 $as_echo "$at_srcdir/cfm.at:232: ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:232"
 ( $at_check_trace; ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18354,7 +18356,7 @@
 $as_echo "$at_srcdir/cfm.at:233: ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:233"
 ( $at_check_trace; ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18381,7 +18383,7 @@
 $as_echo "$at_srcdir/cfm.at:236: ovs-vsctl remove interface p1 cfm_mpid 2"
 at_fn_check_prepare_trace "cfm.at:236"
 ( $at_check_trace; ovs-vsctl remove interface p1 cfm_mpid 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18398,7 +18400,7 @@
 $as_echo "$at_srcdir/cfm.at:238: ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:238"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18417,7 +18419,7 @@
 $as_echo "$at_srcdir/cfm.at:239: ovs-vsctl list interface p1 | sed -n '/cfm_flap_count /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:239"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n '/cfm_flap_count /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18437,7 +18439,7 @@
 $as_echo "$at_srcdir/cfm.at:242: ovs-vsctl set interface p1 cfm_mpid=2"
 at_fn_check_prepare_trace "cfm.at:242"
 ( $at_check_trace; ovs-vsctl set interface p1 cfm_mpid=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18454,7 +18456,7 @@
 $as_echo "$at_srcdir/cfm.at:244: ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:244"
 ( $at_check_trace; ovs-vsctl list interface p0 | sed -n '/cfm_flap_count /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18473,7 +18475,7 @@
 $as_echo "$at_srcdir/cfm.at:246: check_logs "
 at_fn_check_prepare_trace "cfm.at:246"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18488,7 +18490,7 @@
 $as_echo "$at_srcdir/cfm.at:246: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "cfm.at:246"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18503,7 +18505,7 @@
 $as_echo "$at_srcdir/cfm.at:246: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "cfm.at:246"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18537,7 +18539,7 @@
 $as_echo "$at_srcdir/cfm.at:250: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "cfm.at:250"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18551,7 +18553,7 @@
 $as_echo "$at_srcdir/cfm.at:250: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "cfm.at:250"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -18573,7 +18575,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18588,7 +18590,7 @@
 $as_echo "$at_srcdir/cfm.at:250: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "cfm.at:250"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18603,7 +18605,7 @@
 $as_echo "$at_srcdir/cfm.at:250: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "cfm.at:250"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -18635,7 +18637,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18668,7 +18670,7 @@
                     options:peer=p1 -- \
                     set Interface p0 cfm_mpid=1 other_config:cfm_interval=100 other_config:cfm_extended=true -- \
                     set Interface p1 cfm_mpid=2 other_config:cfm_interval=100 other_config:cfm_extended=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18689,7 +18691,7 @@
 $as_echo "$at_srcdir/cfm.at:263: ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:263"
 ( $at_check_trace; ovs-appctl cfm/show p0 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18715,7 +18717,7 @@
 $as_echo "$at_srcdir/cfm.at:264: ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:264"
 ( $at_check_trace; ovs-appctl cfm/show p1 | sed -e '/next CCM tx:/d' | sed -e '/next fault check:/d' | sed -e  '/recv since check:/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18740,7 +18742,7 @@
 $as_echo "$at_srcdir/cfm.at:265: ovs-appctl cfm/show p1 | grep 'fault_override'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:265"
 ( $at_check_trace; ovs-appctl cfm/show p1 | grep 'fault_override'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18756,7 +18758,7 @@
 $as_echo "$at_srcdir/cfm.at:266: ovs-vsctl list interface p1 | sed -n '/cfm_fault_status /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:266"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n '/cfm_fault_status /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18776,7 +18778,7 @@
 $as_echo "$at_srcdir/cfm.at:269: ovs-appctl cfm/set-fault p1 true"
 at_fn_check_prepare_trace "cfm.at:269"
 ( $at_check_trace; ovs-appctl cfm/set-fault p1 true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18793,7 +18795,7 @@
 $as_echo "$at_srcdir/cfm.at:271: ovs-appctl time/warp 100"
 at_fn_check_prepare_trace "cfm.at:271"
 ( $at_check_trace; ovs-appctl time/warp 100
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18808,7 +18810,7 @@
 $as_echo "$at_srcdir/cfm.at:272: ovs-appctl cfm/show p1 | grep 'fault_override' | sed -e 's/MPID [0-9]*: extended //'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:272"
 ( $at_check_trace; ovs-appctl cfm/show p1 | grep 'fault_override' | sed -e 's/MPID [0-9]*: extended //'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18826,7 +18828,7 @@
 $as_echo "$at_srcdir/cfm.at:275: ovs-vsctl list interface p1 | sed -n '/cfm_fault_status /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:275"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n '/cfm_fault_status /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18846,7 +18848,7 @@
 $as_echo "$at_srcdir/cfm.at:278: ovs-appctl cfm/set-fault normal"
 at_fn_check_prepare_trace "cfm.at:278"
 ( $at_check_trace; ovs-appctl cfm/set-fault normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18863,7 +18865,7 @@
 $as_echo "$at_srcdir/cfm.at:280: ovs-appctl time/warp 100"
 at_fn_check_prepare_trace "cfm.at:280"
 ( $at_check_trace; ovs-appctl time/warp 100
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18878,7 +18880,7 @@
 $as_echo "$at_srcdir/cfm.at:281: ovs-appctl cfm/show p1 | grep 'fault_override'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:281"
 ( $at_check_trace; ovs-appctl cfm/show p1 | grep 'fault_override'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18894,7 +18896,7 @@
 $as_echo "$at_srcdir/cfm.at:282: ovs-vsctl list interface p1 | sed -n '/cfm_fault_status /p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "cfm.at:282"
 ( $at_check_trace; ovs-vsctl list interface p1 | sed -n '/cfm_fault_status /p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18913,7 +18915,7 @@
 $as_echo "$at_srcdir/cfm.at:284: check_logs "
 at_fn_check_prepare_trace "cfm.at:284"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18928,7 +18930,7 @@
 $as_echo "$at_srcdir/cfm.at:284: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "cfm.at:284"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18943,7 +18945,7 @@
 $as_echo "$at_srcdir/cfm.at:284: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "cfm.at:284"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18977,7 +18979,7 @@
 $as_echo "$at_srcdir/lacp.at:14: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "lacp.at:14"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -18991,7 +18993,7 @@
 $as_echo "$at_srcdir/lacp.at:14: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "lacp.at:14"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -19013,7 +19015,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19028,7 +19030,7 @@
 $as_echo "$at_srcdir/lacp.at:14: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "lacp.at:14"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19043,7 +19045,7 @@
 $as_echo "$at_srcdir/lacp.at:14: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "lacp.at:14"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -19075,7 +19077,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19098,7 +19100,7 @@
         add-port br0 p1 --\
         set Port p1 lacp=active --\
         set Interface p1 type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19118,7 +19120,7 @@
 $as_echo "$at_srcdir/lacp.at:22: ovs-appctl lacp/show"
 at_fn_check_prepare_trace "lacp.at:22"
 ( $at_check_trace; ovs-appctl lacp/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19159,7 +19161,7 @@
 $as_echo "$at_srcdir/lacp.at:49: ovs-appctl bond/show"
 at_fn_check_prepare_trace "lacp.at:49"
 ( $at_check_trace; ovs-appctl bond/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19174,7 +19176,7 @@
 $as_echo "$at_srcdir/lacp.at:50: check_logs "
 at_fn_check_prepare_trace "lacp.at:50"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19189,7 +19191,7 @@
 $as_echo "$at_srcdir/lacp.at:50: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "lacp.at:50"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19204,7 +19206,7 @@
 $as_echo "$at_srcdir/lacp.at:50: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "lacp.at:50"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19238,7 +19240,7 @@
 $as_echo "$at_srcdir/lacp.at:54: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "lacp.at:54"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19252,7 +19254,7 @@
 $as_echo "$at_srcdir/lacp.at:54: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "lacp.at:54"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -19274,7 +19276,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19289,7 +19291,7 @@
 $as_echo "$at_srcdir/lacp.at:54: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "lacp.at:54"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19304,7 +19306,7 @@
 $as_echo "$at_srcdir/lacp.at:54: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "lacp.at:54"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -19336,7 +19338,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19377,7 +19379,7 @@
             other_config:lacp-port-id=22 \
             other_config:lacp-port-priority=222 \
             other_config:lacp-aggregation-key=3333
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19397,7 +19399,7 @@
 $as_echo "$at_srcdir/lacp.at:72: ovs-appctl lacp/show"
 at_fn_check_prepare_trace "lacp.at:72"
 ( $at_check_trace; ovs-appctl lacp/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19412,7 +19414,7 @@
 $as_echo "$at_srcdir/lacp.at:73: sed -e 's/aggregation key:.*/aggregation key: /' < stdout"
 at_fn_check_prepare_trace "lacp.at:73"
 ( $at_check_trace; sed -e 's/aggregation key:.*/aggregation key: /' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19472,7 +19474,7 @@
 $as_echo "$at_srcdir/lacp.at:119: ovs-appctl bond/show"
 at_fn_check_prepare_trace "lacp.at:119"
 ( $at_check_trace; ovs-appctl bond/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19503,7 +19505,7 @@
 $as_echo "$at_srcdir/lacp.at:136: check_logs "
 at_fn_check_prepare_trace "lacp.at:136"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19518,7 +19520,7 @@
 $as_echo "$at_srcdir/lacp.at:136: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "lacp.at:136"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19533,7 +19535,7 @@
 $as_echo "$at_srcdir/lacp.at:136: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "lacp.at:136"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19570,7 +19572,7 @@
 $as_echo "$at_srcdir/lacp.at:143: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "lacp.at:143"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19584,7 +19586,7 @@
 $as_echo "$at_srcdir/lacp.at:143: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "lacp.at:143"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -19606,7 +19608,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19621,7 +19623,7 @@
 $as_echo "$at_srcdir/lacp.at:143: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "lacp.at:143"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19636,7 +19638,7 @@
 $as_echo "$at_srcdir/lacp.at:143: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "lacp.at:143"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -19668,7 +19670,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19719,7 +19721,7 @@
                     other-config:lacp-aggregation-key=4 -- \
    set interface p3 type=patch options:peer=p1 ofport_request=4 \
                     other-config:lacp-aggregation-key=4 --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19736,7 +19738,7 @@
 $as_echo "$at_srcdir/lacp.at:163: ovs-appctl netdev-dummy/set-admin-state up"
 at_fn_check_prepare_trace "lacp.at:163"
 ( $at_check_trace; ovs-appctl netdev-dummy/set-admin-state up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19801,7 +19803,7 @@
 '  | sed '
     s/active slave mac.*$//
 '
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19818,7 +19820,7 @@
 $as_echo "$at_srcdir/lacp.at:195: sed '/active slave/d' stdout"
 at_fn_check_prepare_trace "lacp.at:195"
 ( $at_check_trace; sed '/active slave/d' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19952,7 +19954,7 @@
 $as_echo "$at_srcdir/lacp.at:313: grep 'active slave\$' stdout"
 at_fn_check_prepare_dynamic "grep 'active slave$' stdout" "lacp.at:313"
 ( $at_check_trace; grep 'active slave$' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -19980,7 +19982,7 @@
 ( $at_check_trace; ovs-vsctl \
 -- add-port br0 null0 -- set int null0 type=patch options:peer=p2 -- set int p2 options:peer=null0 \
 -- add-port br1 null1 -- set int null1 type=patch options:peer=p0 -- set int p0 options:peer=null1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20021,7 +20023,7 @@
 '  | sed '
     s/active slave mac.*$//
 '
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20185,7 +20187,7 @@
 '  | sed '
     s/active slave mac.*$//
 '
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20323,7 +20325,7 @@
 $as_echo "$at_srcdir/lacp.at:582: check_logs "
 at_fn_check_prepare_trace "lacp.at:582"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20340,7 +20342,7 @@
 $as_echo "$at_srcdir/lacp.at:582: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "lacp.at:582"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20357,7 +20359,7 @@
 $as_echo "$at_srcdir/lacp.at:582: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "lacp.at:582"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20387,7 +20389,7 @@
 $as_echo "$at_srcdir/library.at:4: \$PERL \`which flowgen.pl\` >/dev/null 3>flows 4>pcap"
 at_fn_check_prepare_notrace 'a `...` command substitution' "library.at:4"
 ( $at_check_trace; $PERL `which flowgen.pl` >/dev/null 3>flows 4>pcap
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20400,7 +20402,7 @@
 $as_echo "$at_srcdir/library.at:5: ovstest test-flows flows pcap"
 at_fn_check_prepare_trace "library.at:5"
 ( $at_check_trace; ovstest test-flows flows pcap
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20428,7 +20430,7 @@
 $as_echo "$at_srcdir/library.at:10: ovstest test-csum"
 at_fn_check_prepare_trace "library.at:10"
 ( $at_check_trace; ovstest test-csum
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20456,7 +20458,7 @@
 $as_echo "$at_srcdir/library.at:15: ovstest test-hash"
 at_fn_check_prepare_trace "library.at:15"
 ( $at_check_trace; ovstest test-hash
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20483,7 +20485,7 @@
 $as_echo "$at_srcdir/library.at:20: ovstest test-hmap"
 at_fn_check_prepare_trace "library.at:20"
 ( $at_check_trace; ovstest test-hmap
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20512,7 +20514,7 @@
 $as_echo "$at_srcdir/library.at:26: ovstest test-hindex"
 at_fn_check_prepare_trace "library.at:26"
 ( $at_check_trace; ovstest test-hindex
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20541,7 +20543,7 @@
 $as_echo "$at_srcdir/library.at:32: ovstest test-cmap check 1"
 at_fn_check_prepare_trace "library.at:32"
 ( $at_check_trace; ovstest test-cmap check 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20569,7 +20571,7 @@
 $as_echo "$at_srcdir/library.at:37: ovstest test-atomic"
 at_fn_check_prepare_trace "library.at:37"
 ( $at_check_trace; ovstest test-atomic
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20595,7 +20597,7 @@
 $as_echo "$at_srcdir/library.at:41: ovstest test-list"
 at_fn_check_prepare_trace "library.at:41"
 ( $at_check_trace; ovstest test-list
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20623,7 +20625,7 @@
 $as_echo "$at_srcdir/library.at:46: ovstest test-packets"
 at_fn_check_prepare_trace "library.at:46"
 ( $at_check_trace; ovstest test-packets
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20649,7 +20651,7 @@
 $as_echo "$at_srcdir/library.at:50: ovstest test-sha1"
 at_fn_check_prepare_trace "library.at:50"
 ( $at_check_trace; ovstest test-sha1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20677,7 +20679,7 @@
 $as_echo "$at_srcdir/library.at:55: test-type-props"
 at_fn_check_prepare_trace "library.at:55"
 ( $at_check_trace; test-type-props
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20703,7 +20705,7 @@
 $as_echo "$at_srcdir/library.at:59: test-strtok_r"
 at_fn_check_prepare_trace "library.at:59"
 ( $at_check_trace; test-strtok_r
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20732,7 +20734,7 @@
 $as_echo "$at_srcdir/library.at:65: ovstest test-byte-order"
 at_fn_check_prepare_trace "library.at:65"
 ( $at_check_trace; ovstest test-byte-order
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20758,7 +20760,7 @@
 $as_echo "$at_srcdir/library.at:69: ovstest test-random"
 at_fn_check_prepare_trace "library.at:69"
 ( $at_check_trace; ovstest test-random
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20833,7 +20835,7 @@
 $as_echo "$at_srcdir/library.at:120: ovstest test-util ctz"
 at_fn_check_prepare_trace "library.at:120"
 ( $at_check_trace; ovstest test-util ctz
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20860,7 +20862,7 @@
 $as_echo "$at_srcdir/library.at:120: ovstest test-util clz"
 at_fn_check_prepare_trace "library.at:120"
 ( $at_check_trace; ovstest test-util clz
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20887,7 +20889,7 @@
 $as_echo "$at_srcdir/library.at:120: ovstest test-util round_up_pow2"
 at_fn_check_prepare_trace "library.at:120"
 ( $at_check_trace; ovstest test-util round_up_pow2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20914,7 +20916,7 @@
 $as_echo "$at_srcdir/library.at:120: ovstest test-util round_down_pow2"
 at_fn_check_prepare_trace "library.at:120"
 ( $at_check_trace; ovstest test-util round_down_pow2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20941,7 +20943,7 @@
 $as_echo "$at_srcdir/library.at:120: ovstest test-util count_1bits"
 at_fn_check_prepare_trace "library.at:120"
 ( $at_check_trace; ovstest test-util count_1bits
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20968,7 +20970,7 @@
 $as_echo "$at_srcdir/library.at:120: ovstest test-util log_2_floor"
 at_fn_check_prepare_trace "library.at:120"
 ( $at_check_trace; ovstest test-util log_2_floor
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -20995,7 +20997,7 @@
 $as_echo "$at_srcdir/library.at:120: ovstest test-util bitwise_copy"
 at_fn_check_prepare_trace "library.at:120"
 ( $at_check_trace; ovstest test-util bitwise_copy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21022,7 +21024,7 @@
 $as_echo "$at_srcdir/library.at:120: ovstest test-util bitwise_zero"
 at_fn_check_prepare_trace "library.at:120"
 ( $at_check_trace; ovstest test-util bitwise_zero
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21049,7 +21051,7 @@
 $as_echo "$at_srcdir/library.at:120: ovstest test-util bitwise_one"
 at_fn_check_prepare_trace "library.at:120"
 ( $at_check_trace; ovstest test-util bitwise_one
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21076,7 +21078,7 @@
 $as_echo "$at_srcdir/library.at:120: ovstest test-util bitwise_is_all_zeros"
 at_fn_check_prepare_trace "library.at:120"
 ( $at_check_trace; ovstest test-util bitwise_is_all_zeros
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21103,7 +21105,7 @@
 $as_echo "$at_srcdir/library.at:120: ovstest test-util ovs_scan"
 at_fn_check_prepare_trace "library.at:120"
 ( $at_check_trace; ovstest test-util ovs_scan
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21132,7 +21134,7 @@
 $as_echo "$at_srcdir/library.at:140: ovstest test-unix-socket x"
 at_fn_check_prepare_trace "library.at:140"
 ( $at_check_trace; ovstest test-unix-socket x
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21164,7 +21166,7 @@
 $as_echo "$at_srcdir/library.at:154: ovstest test-unix-socket ../\$longname/socket socket"
 at_fn_check_prepare_dynamic "ovstest test-unix-socket ../$longname/socket socket" "library.at:154"
 ( $at_check_trace; ovstest test-unix-socket ../$longname/socket socket
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21193,7 +21195,7 @@
 $as_echo "$at_srcdir/library.at:159: \$PYTHON \$srcdir/test-unix-socket.py x"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-unix-socket.py x" "library.at:159"
 ( $at_check_trace; $PYTHON $srcdir/test-unix-socket.py x
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21225,7 +21227,7 @@
 $as_echo "$at_srcdir/library.at:173: \$PYTHON \$abs_srcdir/test-unix-socket.py ../\$longname/socket socket"
 at_fn_check_prepare_dynamic "$PYTHON $abs_srcdir/test-unix-socket.py ../$longname/socket socket" "library.at:173"
 ( $at_check_trace; $PYTHON $abs_srcdir/test-unix-socket.py ../$longname/socket socket
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21258,7 +21260,7 @@
 $as_echo "$at_srcdir/library.at:184: ovstest test-util -voff -vfile:info '-vPATTERN:file:%c|%p|%m' --log-file assert"
 at_fn_check_prepare_notrace 'a shell pipeline' "library.at:184"
 ( $at_check_trace; ovstest test-util -voff -vfile:info '-vPATTERN:file:%c|%p|%m' --log-file assert
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -21274,7 +21276,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "library.at:187"
 ( $at_check_trace; sed 's/\(opened log file\) .*/\1/
 s/|[^|]*: /|/' test-util.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21293,7 +21295,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "library.at:193"
 ( $at_check_trace; sed 's/.*: //
 1q' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21322,7 +21324,7 @@
 $as_echo "$at_srcdir/library.at:201: ovstest test-util snprintf"
 at_fn_check_prepare_trace "library.at:201"
 ( $at_check_trace; ovstest test-util snprintf
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21348,7 +21350,7 @@
 $as_echo "$at_srcdir/library.at:205: ovstest test-bitmap check"
 at_fn_check_prepare_trace "library.at:205"
 ( $at_check_trace; ovstest test-bitmap check
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21376,7 +21378,7 @@
 $as_echo "$at_srcdir/library.at:210: test-lib"
 at_fn_check_prepare_trace "library.at:210"
 ( $at_check_trace; test-lib
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21402,7 +21404,7 @@
 $as_echo "$at_srcdir/library.at:214: ovstest test-ofpbuf"
 at_fn_check_prepare_trace "library.at:214"
 ( $at_check_trace; ovstest test-ofpbuf
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21417,18 +21419,44 @@
 read at_status <"$at_status_file"
 #AT_STOP_63
 #AT_START_64
-at_fn_group_banner 64 'heap.at:8' \
-  "heap library -- insert delete same order" "       " 7
+at_fn_group_banner 64 'library.at:217' \
+  "test rcu" "                                       " 6
 at_xfail=no
 (
   $as_echo "64. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
+{ set +x
+$as_echo "$at_srcdir/library.at:218: ovstest test-rcu-quiesce"
+at_fn_check_prepare_trace "library.at:218"
+( $at_check_trace; ovstest test-rcu-quiesce
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:218"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_64
+#AT_START_65
+at_fn_group_banner 65 'heap.at:8' \
+  "heap library -- insert delete same order" "       " 7
+at_xfail=no
+(
+  $as_echo "65. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
    { set +x
 $as_echo "$at_srcdir/heap.at:8: ovstest test-heap insert-delete-same-order"
 at_fn_check_prepare_trace "heap.at:8"
 ( $at_check_trace; ovstest test-heap insert-delete-same-order
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21441,20 +21469,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_64
-#AT_START_65
-at_fn_group_banner 65 'heap.at:9' \
+#AT_STOP_65
+#AT_START_66
+at_fn_group_banner 66 'heap.at:9' \
   "heap library -- insert delete reverse order" "    " 7
 at_xfail=no
 (
-  $as_echo "65. $at_setup_line: testing $at_desc ..."
+  $as_echo "66. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/heap.at:9: ovstest test-heap insert-delete-reverse-order"
 at_fn_check_prepare_trace "heap.at:9"
 ( $at_check_trace; ovstest test-heap insert-delete-reverse-order
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21467,20 +21495,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_65
-#AT_START_66
-at_fn_group_banner 66 'heap.at:10' \
+#AT_STOP_66
+#AT_START_67
+at_fn_group_banner 67 'heap.at:10' \
   "heap library -- insert delete every order" "      " 7
 at_xfail=no
 (
-  $as_echo "66. $at_setup_line: testing $at_desc ..."
+  $as_echo "67. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/heap.at:10: ovstest test-heap insert-delete-every-order"
 at_fn_check_prepare_trace "heap.at:10"
 ( $at_check_trace; ovstest test-heap insert-delete-every-order
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21493,20 +21521,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_66
-#AT_START_67
-at_fn_group_banner 67 'heap.at:11' \
+#AT_STOP_67
+#AT_START_68
+at_fn_group_banner 68 'heap.at:11' \
   "heap library -- insert delete same order with dups" "" 7
 at_xfail=no
 (
-  $as_echo "67. $at_setup_line: testing $at_desc ..."
+  $as_echo "68. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/heap.at:11: ovstest test-heap insert-delete-same-order-with-dups"
 at_fn_check_prepare_trace "heap.at:11"
 ( $at_check_trace; ovstest test-heap insert-delete-same-order-with-dups
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21519,20 +21547,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_67
-#AT_START_68
-at_fn_group_banner 68 'heap.at:12' \
+#AT_STOP_68
+#AT_START_69
+at_fn_group_banner 69 'heap.at:12' \
   "heap library -- raw insert" "                     " 7
 at_xfail=no
 (
-  $as_echo "68. $at_setup_line: testing $at_desc ..."
+  $as_echo "69. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/heap.at:12: ovstest test-heap raw-insert"
 at_fn_check_prepare_trace "heap.at:12"
 ( $at_check_trace; ovstest test-heap raw-insert
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21545,20 +21573,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_68
-#AT_START_69
-at_fn_group_banner 69 'heap.at:13' \
+#AT_STOP_69
+#AT_START_70
+at_fn_group_banner 70 'heap.at:13' \
   "heap library -- raw delete" "                     " 7
 at_xfail=no
 (
-  $as_echo "69. $at_setup_line: testing $at_desc ..."
+  $as_echo "70. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/heap.at:13: ovstest test-heap raw-delete"
 at_fn_check_prepare_trace "heap.at:13"
 ( $at_check_trace; ovstest test-heap raw-delete
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21571,20 +21599,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_69
-#AT_START_70
-at_fn_group_banner 70 'bundle.at:10' \
+#AT_STOP_70
+#AT_START_71
+at_fn_group_banner 71 'bundle.at:10' \
   "hrw bundle link selection" "                      " 8
 at_xfail=no
 (
-  $as_echo "70. $at_setup_line: testing $at_desc ..."
+  $as_echo "71. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/bundle.at:11: ovstest test-bundle 'symmetric_l4,60,hrw,ofport,NXM_NX_REG0[],slaves:1,2,3,4,5'"
 at_fn_check_prepare_trace "bundle.at:11"
 ( $at_check_trace; ovstest test-bundle 'symmetric_l4,60,hrw,ofport,NXM_NX_REG0[],slaves:1,2,3,4,5'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21662,20 +21690,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_70
-#AT_START_71
-at_fn_group_banner 71 'bundle.at:80' \
+#AT_STOP_71
+#AT_START_72
+at_fn_group_banner 72 'bundle.at:80' \
   "active_backup bundle link selection" "            " 8
 at_xfail=no
 (
-  $as_echo "71. $at_setup_line: testing $at_desc ..."
+  $as_echo "72. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/bundle.at:81: ovstest test-bundle 'symmetric_l4,60,active_backup,ofport,NXM_NX_REG0[],slaves:1,2,3,4,5,6'"
 at_fn_check_prepare_trace "bundle.at:81"
 ( $at_check_trace; ovstest test-bundle 'symmetric_l4,60,active_backup,ofport,NXM_NX_REG0[],slaves:1,2,3,4,5,6'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21754,20 +21782,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_71
-#AT_START_72
-at_fn_group_banner 72 'bundle.at:151' \
+#AT_STOP_72
+#AT_START_73
+at_fn_group_banner 73 'bundle.at:151' \
   "hrw bundle single link selection" "               " 8
 at_xfail=no
 (
-  $as_echo "72. $at_setup_line: testing $at_desc ..."
+  $as_echo "73. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/bundle.at:152: ovstest test-bundle 'symmetric_l4,60,hrw,ofport,NXM_NX_REG0[],slaves:1'"
 at_fn_check_prepare_trace "bundle.at:152"
 ( $at_check_trace; ovstest test-bundle 'symmetric_l4,60,hrw,ofport,NXM_NX_REG0[],slaves:1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21783,20 +21811,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_72
-#AT_START_73
-at_fn_group_banner 73 'bundle.at:159' \
+#AT_STOP_73
+#AT_START_74
+at_fn_group_banner 74 'bundle.at:159' \
   "hrw bundle no link selection" "                   " 8
 at_xfail=no
 (
-  $as_echo "73. $at_setup_line: testing $at_desc ..."
+  $as_echo "74. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/bundle.at:160: ovstest test-bundle 'symmetric_l4,60,hrw,ofport,NXM_NX_REG0[],slaves:'"
 at_fn_check_prepare_trace "bundle.at:160"
 ( $at_check_trace; ovstest test-bundle 'symmetric_l4,60,hrw,ofport,NXM_NX_REG0[],slaves:'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21809,20 +21837,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_73
-#AT_START_74
-at_fn_group_banner 74 'bundle.at:166' \
+#AT_STOP_74
+#AT_START_75
+at_fn_group_banner 75 'bundle.at:166' \
   "bundle action missing argument" "                 " 8
 at_xfail=no
 (
-  $as_echo "74. $at_setup_line: testing $at_desc ..."
+  $as_echo "75. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/bundle.at:167: ovs-ofctl parse-flow actions=bundle"
 at_fn_check_prepare_trace "bundle.at:167"
 ( $at_check_trace; ovs-ofctl parse-flow actions=bundle
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: : not enough arguments to bundle action
@@ -21837,20 +21865,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_74
-#AT_START_75
-at_fn_group_banner 75 'bundle.at:172' \
+#AT_STOP_75
+#AT_START_76
+at_fn_group_banner 76 'bundle.at:172' \
   "bundle action bad fields" "                       " 8
 at_xfail=no
 (
-  $as_echo "75. $at_setup_line: testing $at_desc ..."
+  $as_echo "76. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/bundle.at:173: ovs-ofctl parse-flow 'actions=bundle(xyzzy,60,hrw,ofport,slaves:1,2))'"
 at_fn_check_prepare_trace "bundle.at:173"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=bundle(xyzzy,60,hrw,ofport,slaves:1,2))'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: xyzzy,60,hrw,ofport,slaves:1,2: unknown fields \`xyzzy'
@@ -21865,20 +21893,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_75
-#AT_START_76
-at_fn_group_banner 76 'bundle.at:178' \
+#AT_STOP_76
+#AT_START_77
+at_fn_group_banner 77 'bundle.at:178' \
   "bundle action bad algorithm" "                    " 8
 at_xfail=no
 (
-  $as_echo "76. $at_setup_line: testing $at_desc ..."
+  $as_echo "77. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/bundle.at:179: ovs-ofctl parse-flow 'actions=bundle(symmetric_l4,60,fubar,ofport,slaves:1,2))'"
 at_fn_check_prepare_trace "bundle.at:179"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=bundle(symmetric_l4,60,fubar,ofport,slaves:1,2))'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: symmetric_l4,60,fubar,ofport,slaves:1,2: unknown algorithm \`fubar'
@@ -21893,20 +21921,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_76
-#AT_START_77
-at_fn_group_banner 77 'bundle.at:184' \
+#AT_STOP_77
+#AT_START_78
+at_fn_group_banner 78 'bundle.at:184' \
   "bundle action bad slave type" "                   " 8
 at_xfail=no
 (
-  $as_echo "77. $at_setup_line: testing $at_desc ..."
+  $as_echo "78. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/bundle.at:185: ovs-ofctl parse-flow 'actions=bundle(symmetric_l4,60,hrw,robot,slaves:1,2))'"
 at_fn_check_prepare_trace "bundle.at:185"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=bundle(symmetric_l4,60,hrw,robot,slaves:1,2))'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: symmetric_l4,60,hrw,robot,slaves:1,2: unknown slave_type \`robot'
@@ -21921,20 +21949,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_77
-#AT_START_78
-at_fn_group_banner 78 'bundle.at:190' \
+#AT_STOP_78
+#AT_START_79
+at_fn_group_banner 79 'bundle.at:190' \
   "bundle action bad slave delimiter" "              " 8
 at_xfail=no
 (
-  $as_echo "78. $at_setup_line: testing $at_desc ..."
+  $as_echo "79. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/bundle.at:191: ovs-ofctl parse-flow 'actions=bundle(symmetric_l4,60,hrw,ofport,robot:1,2))'"
 at_fn_check_prepare_trace "bundle.at:191"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=bundle(symmetric_l4,60,hrw,ofport,robot:1,2))'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: symmetric_l4,60,hrw,ofport,robot:1,2: missing slave delimiter, expected \`slaves' got \`robot'
@@ -21949,20 +21977,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_78
-#AT_START_79
-at_fn_group_banner 79 'classifier.at:2' \
+#AT_STOP_79
+#AT_START_80
+at_fn_group_banner 80 'classifier.at:2' \
   "flow classifier - empty" "                        " 9
 at_xfail=no
 (
-  $as_echo "79. $at_setup_line: testing $at_desc ..."
+  $as_echo "80. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:2: ovstest test-classifier empty"
 at_fn_check_prepare_trace "classifier.at:2"
 ( $at_check_trace; ovstest test-classifier empty
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -21975,20 +22003,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_79
-#AT_START_80
-at_fn_group_banner 80 'classifier.at:2' \
+#AT_STOP_80
+#AT_START_81
+at_fn_group_banner 81 'classifier.at:2' \
   "flow classifier - destroy null" "                 " 9
 at_xfail=no
 (
-  $as_echo "80. $at_setup_line: testing $at_desc ..."
+  $as_echo "81. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:2: ovstest test-classifier destroy-null"
 at_fn_check_prepare_trace "classifier.at:2"
 ( $at_check_trace; ovstest test-classifier destroy-null
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22001,20 +22029,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_80
-#AT_START_81
-at_fn_group_banner 81 'classifier.at:2' \
+#AT_STOP_81
+#AT_START_82
+at_fn_group_banner 82 'classifier.at:2' \
   "flow classifier - single rule" "                  " 9
 at_xfail=no
 (
-  $as_echo "81. $at_setup_line: testing $at_desc ..."
+  $as_echo "82. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:2: ovstest test-classifier single-rule"
 at_fn_check_prepare_trace "classifier.at:2"
 ( $at_check_trace; ovstest test-classifier single-rule
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22027,20 +22055,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_81
-#AT_START_82
-at_fn_group_banner 82 'classifier.at:2' \
+#AT_STOP_82
+#AT_START_83
+at_fn_group_banner 83 'classifier.at:2' \
   "flow classifier - rule replacement" "             " 9
 at_xfail=no
 (
-  $as_echo "82. $at_setup_line: testing $at_desc ..."
+  $as_echo "83. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:2: ovstest test-classifier rule-replacement"
 at_fn_check_prepare_trace "classifier.at:2"
 ( $at_check_trace; ovstest test-classifier rule-replacement
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22053,20 +22081,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_82
-#AT_START_83
-at_fn_group_banner 83 'classifier.at:2' \
+#AT_STOP_83
+#AT_START_84
+at_fn_group_banner 84 'classifier.at:2' \
   "flow classifier - many rules in one list" "       " 9
 at_xfail=no
 (
-  $as_echo "83. $at_setup_line: testing $at_desc ..."
+  $as_echo "84. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:2: ovstest test-classifier many-rules-in-one-list"
 at_fn_check_prepare_trace "classifier.at:2"
 ( $at_check_trace; ovstest test-classifier many-rules-in-one-list
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22079,20 +22107,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_83
-#AT_START_84
-at_fn_group_banner 84 'classifier.at:2' \
+#AT_STOP_84
+#AT_START_85
+at_fn_group_banner 85 'classifier.at:2' \
   "flow classifier - versioned many rules in one list" "" 9
 at_xfail=no
 (
-  $as_echo "84. $at_setup_line: testing $at_desc ..."
+  $as_echo "85. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:2: ovstest test-classifier --versioned many-rules-in-one-list"
 at_fn_check_prepare_trace "classifier.at:2"
 ( $at_check_trace; ovstest test-classifier --versioned many-rules-in-one-list
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22105,20 +22133,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_84
-#AT_START_85
-at_fn_group_banner 85 'classifier.at:2' \
+#AT_STOP_85
+#AT_START_86
+at_fn_group_banner 86 'classifier.at:2' \
   "flow classifier - many rules in one table" "      " 9
 at_xfail=no
 (
-  $as_echo "85. $at_setup_line: testing $at_desc ..."
+  $as_echo "86. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:2: ovstest test-classifier many-rules-in-one-table"
 at_fn_check_prepare_trace "classifier.at:2"
 ( $at_check_trace; ovstest test-classifier many-rules-in-one-table
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22131,20 +22159,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_85
-#AT_START_86
-at_fn_group_banner 86 'classifier.at:2' \
+#AT_STOP_86
+#AT_START_87
+at_fn_group_banner 87 'classifier.at:2' \
   "flow classifier - versioned many rules in one table" "" 9
 at_xfail=no
 (
-  $as_echo "86. $at_setup_line: testing $at_desc ..."
+  $as_echo "87. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:2: ovstest test-classifier --versioned many-rules-in-one-table"
 at_fn_check_prepare_trace "classifier.at:2"
 ( $at_check_trace; ovstest test-classifier --versioned many-rules-in-one-table
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22157,20 +22185,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_86
-#AT_START_87
-at_fn_group_banner 87 'classifier.at:2' \
+#AT_STOP_87
+#AT_START_88
+at_fn_group_banner 88 'classifier.at:2' \
   "flow classifier - many rules in two tables" "     " 9
 at_xfail=no
 (
-  $as_echo "87. $at_setup_line: testing $at_desc ..."
+  $as_echo "88. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:2: ovstest test-classifier many-rules-in-two-tables"
 at_fn_check_prepare_trace "classifier.at:2"
 ( $at_check_trace; ovstest test-classifier many-rules-in-two-tables
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22183,20 +22211,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_87
-#AT_START_88
-at_fn_group_banner 88 'classifier.at:2' \
+#AT_STOP_88
+#AT_START_89
+at_fn_group_banner 89 'classifier.at:2' \
   "flow classifier - versioned many rules in two tables" "" 9
 at_xfail=no
 (
-  $as_echo "88. $at_setup_line: testing $at_desc ..."
+  $as_echo "89. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:2: ovstest test-classifier --versioned many-rules-in-two-tables"
 at_fn_check_prepare_trace "classifier.at:2"
 ( $at_check_trace; ovstest test-classifier --versioned many-rules-in-two-tables
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22209,20 +22237,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_88
-#AT_START_89
-at_fn_group_banner 89 'classifier.at:2' \
+#AT_STOP_89
+#AT_START_90
+at_fn_group_banner 90 'classifier.at:2' \
   "flow classifier - many rules in five tables" "    " 9
 at_xfail=no
 (
-  $as_echo "89. $at_setup_line: testing $at_desc ..."
+  $as_echo "90. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:2: ovstest test-classifier many-rules-in-five-tables"
 at_fn_check_prepare_trace "classifier.at:2"
 ( $at_check_trace; ovstest test-classifier many-rules-in-five-tables
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22235,20 +22263,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_89
-#AT_START_90
-at_fn_group_banner 90 'classifier.at:2' \
+#AT_STOP_90
+#AT_START_91
+at_fn_group_banner 91 'classifier.at:2' \
   "flow classifier - versioned many rules in five tables" "" 9
 at_xfail=no
 (
-  $as_echo "90. $at_setup_line: testing $at_desc ..."
+  $as_echo "91. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:2: ovstest test-classifier --versioned many-rules-in-five-tables"
 at_fn_check_prepare_trace "classifier.at:2"
 ( $at_check_trace; ovstest test-classifier --versioned many-rules-in-five-tables
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22261,20 +22289,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_90
-#AT_START_91
-at_fn_group_banner 91 'classifier.at:21' \
+#AT_STOP_91
+#AT_START_92
+at_fn_group_banner 92 'classifier.at:21' \
   "miniflow - miniflow" "                            " 10
 at_xfail=no
 (
-  $as_echo "91. $at_setup_line: testing $at_desc ..."
+  $as_echo "92. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:21: ovstest test-classifier miniflow"
 at_fn_check_prepare_trace "classifier.at:21"
 ( $at_check_trace; ovstest test-classifier miniflow
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22287,20 +22315,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_91
-#AT_START_92
-at_fn_group_banner 92 'classifier.at:21' \
+#AT_STOP_92
+#AT_START_93
+at_fn_group_banner 93 'classifier.at:21' \
   "miniflow - minimask_has_extra" "                  " 10
 at_xfail=no
 (
-  $as_echo "92. $at_setup_line: testing $at_desc ..."
+  $as_echo "93. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:21: ovstest test-classifier minimask_has_extra"
 at_fn_check_prepare_trace "classifier.at:21"
 ( $at_check_trace; ovstest test-classifier minimask_has_extra
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22313,20 +22341,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_92
-#AT_START_93
-at_fn_group_banner 93 'classifier.at:21' \
+#AT_STOP_93
+#AT_START_94
+at_fn_group_banner 94 'classifier.at:21' \
   "miniflow - minimask_combine" "                    " 10
 at_xfail=no
 (
-  $as_echo "93. $at_setup_line: testing $at_desc ..."
+  $as_echo "94. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    { set +x
 $as_echo "$at_srcdir/classifier.at:21: ovstest test-classifier minimask_combine"
 at_fn_check_prepare_trace "classifier.at:21"
 ( $at_check_trace; ovstest test-classifier minimask_combine
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22339,13 +22367,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_93
-#AT_START_94
-at_fn_group_banner 94 'classifier.at:31' \
+#AT_STOP_94
+#AT_START_95
+at_fn_group_banner 95 'classifier.at:31' \
   "flow classifier - lookup segmentation" "          " 11
 at_xfail=no
 (
-  $as_echo "94. $at_setup_line: testing $at_desc ..."
+  $as_echo "95. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -22358,7 +22386,7 @@
 $as_echo "$at_srcdir/classifier.at:32: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "classifier.at:32"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22372,7 +22400,7 @@
 $as_echo "$at_srcdir/classifier.at:32: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "classifier.at:32"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -22394,7 +22422,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22409,7 +22437,7 @@
 $as_echo "$at_srcdir/classifier.at:32: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "classifier.at:32"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22424,7 +22452,7 @@
 $as_echo "$at_srcdir/classifier.at:32: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "classifier.at:32"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -22456,7 +22484,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22473,7 +22501,7 @@
 $as_echo "$at_srcdir/classifier.at:32: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "classifier.at:32"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22504,7 +22532,7 @@
 $as_echo "$at_srcdir/classifier.at:44: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "classifier.at:44"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22519,7 +22547,7 @@
 $as_echo "$at_srcdir/classifier.at:45: ovs-appctl ofproto/trace br0 'in_port=2,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'"
 at_fn_check_prepare_trace "classifier.at:45"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=2,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22534,7 +22562,7 @@
 $as_echo "$at_srcdir/classifier.at:46: tail -2 stdout"
 at_fn_check_prepare_trace "classifier.at:46"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22552,7 +22580,7 @@
 $as_echo "$at_srcdir/classifier.at:50: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=11.1.2.15,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'"
 at_fn_check_prepare_trace "classifier.at:50"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=11.1.2.15,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22567,7 +22595,7 @@
 $as_echo "$at_srcdir/classifier.at:51: tail -2 stdout"
 at_fn_check_prepare_trace "classifier.at:51"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22585,7 +22613,7 @@
 $as_echo "$at_srcdir/classifier.at:55: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=10.1.2.15,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'"
 at_fn_check_prepare_trace "classifier.at:55"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=10.1.2.15,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22600,7 +22628,7 @@
 $as_echo "$at_srcdir/classifier.at:56: tail -2 stdout"
 at_fn_check_prepare_trace "classifier.at:56"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22618,7 +22646,7 @@
 $as_echo "$at_srcdir/classifier.at:60: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=10.1.2.15,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=79'"
 at_fn_check_prepare_trace "classifier.at:60"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=10.1.2.15,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=79'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22633,7 +22661,7 @@
 $as_echo "$at_srcdir/classifier.at:61: tail -2 stdout"
 at_fn_check_prepare_trace "classifier.at:61"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22651,7 +22679,7 @@
 $as_echo "$at_srcdir/classifier.at:65: check_logs "
 at_fn_check_prepare_trace "classifier.at:65"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22666,7 +22694,7 @@
 $as_echo "$at_srcdir/classifier.at:65: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "classifier.at:65"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22681,7 +22709,7 @@
 $as_echo "$at_srcdir/classifier.at:65: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "classifier.at:65"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22696,13 +22724,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_94
-#AT_START_95
-at_fn_group_banner 95 'classifier.at:69' \
+#AT_STOP_95
+#AT_START_96
+at_fn_group_banner 96 'classifier.at:69' \
   "flow classifier - prefix lookup" "                " 12
 at_xfail=no
 (
-  $as_echo "95. $at_setup_line: testing $at_desc ..."
+  $as_echo "96. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -22715,7 +22743,7 @@
 $as_echo "$at_srcdir/classifier.at:70: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "classifier.at:70"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22729,7 +22757,7 @@
 $as_echo "$at_srcdir/classifier.at:70: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "classifier.at:70"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -22751,7 +22779,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22766,7 +22794,7 @@
 $as_echo "$at_srcdir/classifier.at:70: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "classifier.at:70"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22781,7 +22809,7 @@
 $as_echo "$at_srcdir/classifier.at:70: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "classifier.at:70"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -22813,7 +22841,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22830,7 +22858,7 @@
 $as_echo "$at_srcdir/classifier.at:70: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "classifier.at:70"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22850,7 +22878,7 @@
 $as_echo "$at_srcdir/classifier.at:72: ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0"
 at_fn_check_prepare_trace "classifier.at:72"
 ( $at_check_trace; ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22878,7 +22906,7 @@
 $as_echo "$at_srcdir/classifier.at:85: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "classifier.at:85"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22895,7 +22923,7 @@
 $as_echo "$at_srcdir/classifier.at:88: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'"
 at_fn_check_prepare_trace "classifier.at:88"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22910,7 +22938,7 @@
 $as_echo "$at_srcdir/classifier.at:89: tail -2 stdout"
 at_fn_check_prepare_trace "classifier.at:89"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22929,7 +22957,7 @@
 $as_echo "$at_srcdir/classifier.at:94: ovs-vsctl set Flow_Table t0 prefixes=ipv6_label"
 at_fn_check_prepare_trace "classifier.at:94"
 ( $at_check_trace; ovs-vsctl set Flow_Table t0 prefixes=ipv6_label
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22944,7 +22972,7 @@
 $as_echo "$at_srcdir/classifier.at:95: ovs-vsctl set Flow_Table t0 prefixes=nw_dst,nw_src,tun_dst,tun_src"
 at_fn_check_prepare_trace "classifier.at:95"
 ( $at_check_trace; ovs-vsctl set Flow_Table t0 prefixes=nw_dst,nw_src,tun_dst,tun_src
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: nw_dst,nw_src,tun_dst,tun_src: 4 value(s) specified but the maximum number is 3
@@ -22961,7 +22989,7 @@
 $as_echo "$at_srcdir/classifier.at:98: ovs-vsctl set Flow_Table t0 prefixes=nw_dst,nw_dst"
 at_fn_check_prepare_trace "classifier.at:98"
 ( $at_check_trace; ovs-vsctl set Flow_Table t0 prefixes=nw_dst,nw_dst
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: nw_dst,nw_dst: set contains duplicate value
@@ -22979,7 +23007,7 @@
 $as_echo "$at_srcdir/classifier.at:102: ovs-vsctl set Flow_Table t0 prefixes=nw_dst"
 at_fn_check_prepare_trace "classifier.at:102"
 ( $at_check_trace; ovs-vsctl set Flow_Table t0 prefixes=nw_dst
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -22994,7 +23022,7 @@
 $as_echo "$at_srcdir/classifier.at:103: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'"
 at_fn_check_prepare_trace "classifier.at:103"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23009,7 +23037,7 @@
 $as_echo "$at_srcdir/classifier.at:104: tail -2 stdout"
 at_fn_check_prepare_trace "classifier.at:104"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23027,7 +23055,7 @@
 $as_echo "$at_srcdir/classifier.at:108: ovs-appctl ofproto/trace br0 'in_port=2,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'"
 at_fn_check_prepare_trace "classifier.at:108"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=2,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23042,7 +23070,7 @@
 $as_echo "$at_srcdir/classifier.at:109: tail -2 stdout"
 at_fn_check_prepare_trace "classifier.at:109"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23060,7 +23088,7 @@
 $as_echo "$at_srcdir/classifier.at:113: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=10.1.2.15,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'"
 at_fn_check_prepare_trace "classifier.at:113"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=10.1.2.15,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=80'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23075,7 +23103,7 @@
 $as_echo "$at_srcdir/classifier.at:114: tail -2 stdout"
 at_fn_check_prepare_trace "classifier.at:114"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23093,7 +23121,7 @@
 $as_echo "$at_srcdir/classifier.at:118: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=10.1.2.15,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=79'"
 at_fn_check_prepare_trace "classifier.at:118"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=10.1.2.15,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=79'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23108,7 +23136,7 @@
 $as_echo "$at_srcdir/classifier.at:119: tail -2 stdout"
 at_fn_check_prepare_trace "classifier.at:119"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23126,7 +23154,7 @@
 $as_echo "$at_srcdir/classifier.at:123: ovs-vsctl set Flow_Table t0 prefixes=none"
 at_fn_check_prepare_trace "classifier.at:123"
 ( $at_check_trace; ovs-vsctl set Flow_Table t0 prefixes=none
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23141,7 +23169,7 @@
 $as_echo "$at_srcdir/classifier.at:124: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=10.1.3.16,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=79'"
 at_fn_check_prepare_trace "classifier.at:124"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=10.1.3.16,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=79'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23156,7 +23184,7 @@
 $as_echo "$at_srcdir/classifier.at:125: tail -2 stdout"
 at_fn_check_prepare_trace "classifier.at:125"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23174,7 +23202,7 @@
 $as_echo "$at_srcdir/classifier.at:129: check_logs \"/'prefixes' with incompatible field: ipv6_label/d\""
 at_fn_check_prepare_trace "classifier.at:129"
 ( $at_check_trace; check_logs "/'prefixes' with incompatible field: ipv6_label/d"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23189,7 +23217,7 @@
 $as_echo "$at_srcdir/classifier.at:129: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "classifier.at:129"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23204,7 +23232,7 @@
 $as_echo "$at_srcdir/classifier.at:129: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "classifier.at:129"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23219,13 +23247,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_95
-#AT_START_96
-at_fn_group_banner 96 'classifier.at:134' \
+#AT_STOP_96
+#AT_START_97
+at_fn_group_banner 97 'classifier.at:134' \
   "single conjunctive match" "                       " 13
 at_xfail=no
 (
-  $as_echo "96. $at_setup_line: testing $at_desc ..."
+  $as_echo "97. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -23238,7 +23266,7 @@
 $as_echo "$at_srcdir/classifier.at:135: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "classifier.at:135"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23252,7 +23280,7 @@
 $as_echo "$at_srcdir/classifier.at:135: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "classifier.at:135"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -23274,7 +23302,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23289,7 +23317,7 @@
 $as_echo "$at_srcdir/classifier.at:135: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "classifier.at:135"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23304,7 +23332,7 @@
 $as_echo "$at_srcdir/classifier.at:135: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "classifier.at:135"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -23336,7 +23364,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23353,7 +23381,7 @@
 $as_echo "$at_srcdir/classifier.at:135: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "classifier.at:135"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23391,7 +23419,7 @@
 $as_echo "$at_srcdir/classifier.at:152: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "classifier.at:152"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23416,7 +23444,7 @@
 $as_echo "$at_srcdir/classifier.at:163: ovs-appctl ofproto/trace br0 \"in_port=1,dl_type=0x0800,nw_src=10.0.0.\$src,nw_dst=10.0.0.\$dst\""
 at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"in_port=1,dl_type=0x0800,nw_src=10.0.0.$src,nw_dst=10.0.0.$dst\"" "classifier.at:163"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "in_port=1,dl_type=0x0800,nw_src=10.0.0.$src,nw_dst=10.0.0.$dst"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23431,7 +23459,7 @@
 $as_echo "$at_srcdir/classifier.at:164: tail -1 stdout"
 at_fn_check_prepare_trace "classifier.at:164"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23450,7 +23478,7 @@
 $as_echo "$at_srcdir/classifier.at:168: check_logs "
 at_fn_check_prepare_trace "classifier.at:168"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23465,7 +23493,7 @@
 $as_echo "$at_srcdir/classifier.at:168: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "classifier.at:168"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23480,7 +23508,7 @@
 $as_echo "$at_srcdir/classifier.at:168: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "classifier.at:168"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23495,13 +23523,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_96
-#AT_START_97
-at_fn_group_banner 97 'classifier.at:171' \
+#AT_STOP_97
+#AT_START_98
+at_fn_group_banner 98 'classifier.at:171' \
   "multiple conjunctive match" "                     " 13
 at_xfail=no
 (
-  $as_echo "97. $at_setup_line: testing $at_desc ..."
+  $as_echo "98. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -23514,7 +23542,7 @@
 $as_echo "$at_srcdir/classifier.at:172: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "classifier.at:172"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23528,7 +23556,7 @@
 $as_echo "$at_srcdir/classifier.at:172: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "classifier.at:172"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -23550,7 +23578,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23565,7 +23593,7 @@
 $as_echo "$at_srcdir/classifier.at:172: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "classifier.at:172"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23580,7 +23608,7 @@
 $as_echo "$at_srcdir/classifier.at:172: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "classifier.at:172"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -23612,7 +23640,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23629,7 +23657,7 @@
 $as_echo "$at_srcdir/classifier.at:172: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "classifier.at:172"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23679,7 +23707,7 @@
 $as_echo "$at_srcdir/classifier.at:201: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "classifier.at:201"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23724,7 +23752,7 @@
 $as_echo "$at_srcdir/classifier.at:232: ovs-appctl ofproto/trace br0 \"in_port=5,dl_type=0x0800,nw_proto=6,nw_src=\$ip_src,nw_dst=\$ip_dst,tcp_src=\$tcp_src,tcp_dst=\$tcp_dst\""
 at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"in_port=5,dl_type=0x0800,nw_proto=6,nw_src=$ip_src,nw_dst=$ip_dst,tcp_src=$tcp_src,tcp_dst=$tcp_dst\"" "classifier.at:232"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "in_port=5,dl_type=0x0800,nw_proto=6,nw_src=$ip_src,nw_dst=$ip_dst,tcp_src=$tcp_src,tcp_dst=$tcp_dst"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23739,7 +23767,7 @@
 $as_echo "$at_srcdir/classifier.at:233: tail -1 stdout"
 at_fn_check_prepare_trace "classifier.at:233"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23760,7 +23788,7 @@
 $as_echo "$at_srcdir/classifier.at:239: check_logs "
 at_fn_check_prepare_trace "classifier.at:239"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23775,7 +23803,7 @@
 $as_echo "$at_srcdir/classifier.at:239: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "classifier.at:239"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23790,7 +23818,7 @@
 $as_echo "$at_srcdir/classifier.at:239: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "classifier.at:239"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23805,13 +23833,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_97
-#AT_START_98
-at_fn_group_banner 98 'classifier.at:247' \
+#AT_STOP_98
+#AT_START_99
+at_fn_group_banner 99 'classifier.at:247' \
   "conjunctive match priority fallback" "            " 13
 at_xfail=no
 (
-  $as_echo "98. $at_setup_line: testing $at_desc ..."
+  $as_echo "99. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -23824,7 +23852,7 @@
 $as_echo "$at_srcdir/classifier.at:248: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "classifier.at:248"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23838,7 +23866,7 @@
 $as_echo "$at_srcdir/classifier.at:248: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "classifier.at:248"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -23860,7 +23888,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23875,7 +23903,7 @@
 $as_echo "$at_srcdir/classifier.at:248: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "classifier.at:248"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23890,7 +23918,7 @@
 $as_echo "$at_srcdir/classifier.at:248: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "classifier.at:248"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -23922,7 +23950,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23939,7 +23967,7 @@
 $as_echo "$at_srcdir/classifier.at:248: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "classifier.at:248"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -23988,7 +24016,7 @@
 $as_echo "$at_srcdir/classifier.at:274: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "classifier.at:274"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24013,7 +24041,7 @@
 $as_echo "$at_srcdir/classifier.at:285: ovs-appctl ofproto/trace br0 \"in_port=7,dl_type=0x0800,nw_src=10.0.0.\$src,nw_dst=10.0.0.\$dst\""
 at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"in_port=7,dl_type=0x0800,nw_src=10.0.0.$src,nw_dst=10.0.0.$dst\"" "classifier.at:285"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "in_port=7,dl_type=0x0800,nw_src=10.0.0.$src,nw_dst=10.0.0.$dst"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24028,7 +24056,7 @@
 $as_echo "$at_srcdir/classifier.at:286: tail -1 stdout"
 at_fn_check_prepare_trace "classifier.at:286"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24047,7 +24075,7 @@
 $as_echo "$at_srcdir/classifier.at:290: check_logs "
 at_fn_check_prepare_trace "classifier.at:290"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24062,7 +24090,7 @@
 $as_echo "$at_srcdir/classifier.at:290: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "classifier.at:290"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24077,7 +24105,7 @@
 $as_echo "$at_srcdir/classifier.at:290: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "classifier.at:290"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24092,13 +24120,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_98
-#AT_START_99
-at_fn_group_banner 99 'classifier.at:293' \
+#AT_STOP_99
+#AT_START_100
+at_fn_group_banner 100 'classifier.at:293' \
   "conjunctive match and other actions" "            " 13
 at_xfail=no
 (
-  $as_echo "99. $at_setup_line: testing $at_desc ..."
+  $as_echo "100. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -24111,7 +24139,7 @@
 $as_echo "$at_srcdir/classifier.at:294: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "classifier.at:294"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24125,7 +24153,7 @@
 $as_echo "$at_srcdir/classifier.at:294: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "classifier.at:294"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -24147,7 +24175,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24162,7 +24190,7 @@
 $as_echo "$at_srcdir/classifier.at:294: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "classifier.at:294"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24177,7 +24205,7 @@
 $as_echo "$at_srcdir/classifier.at:294: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "classifier.at:294"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -24209,7 +24237,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24226,7 +24254,7 @@
 $as_echo "$at_srcdir/classifier.at:294: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "classifier.at:294"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24243,7 +24271,7 @@
 $as_echo "$at_srcdir/classifier.at:296: ovs-ofctl add-flow br0 'actions=conjunction(3,1/2),note:41.42.43.44.45.46'"
 at_fn_check_prepare_trace "classifier.at:296"
 ( $at_check_trace; ovs-ofctl add-flow br0 'actions=conjunction(3,1/2),note:41.42.43.44.45.46'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24258,7 +24286,7 @@
 $as_echo "$at_srcdir/classifier.at:297: ovs-ofctl add-flow br0 'actions=note:41.42.43.44.45.46,conjunction(3,1/2)'"
 at_fn_check_prepare_trace "classifier.at:297"
 ( $at_check_trace; ovs-ofctl add-flow br0 'actions=note:41.42.43.44.45.46,conjunction(3,1/2)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24274,7 +24302,7 @@
 $as_echo "$at_srcdir/classifier.at:299: ovs-ofctl '-vPATTERN:console:%c|%p|%m' add-flow br0 'actions=output:1,conjunction(3,1/2)'"
 at_fn_check_prepare_notrace 'a shell pipeline' "classifier.at:299"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' add-flow br0 'actions=output:1,conjunction(3,1/2)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ofp_actions|WARN|\"conjunction\" actions may be used along with \"note\" but not any other kind of action (such as the \"output\" action used here)
@@ -24292,7 +24320,7 @@
 $as_echo "$at_srcdir/classifier.at:303: ovs-ofctl '-vPATTERN:console:%c|%p|%m' add-flow br0 'actions=conjunction(3,1/2),output:1'"
 at_fn_check_prepare_notrace 'a shell pipeline' "classifier.at:303"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' add-flow br0 'actions=conjunction(3,1/2),output:1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ofp_actions|WARN|\"conjunction\" actions may be used along with \"note\" but not any other kind of action (such as the \"output\" action used here)
@@ -24310,7 +24338,7 @@
 $as_echo "$at_srcdir/classifier.at:307: check_logs "
 at_fn_check_prepare_trace "classifier.at:307"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24325,7 +24353,7 @@
 $as_echo "$at_srcdir/classifier.at:307: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "classifier.at:307"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24340,7 +24368,7 @@
 $as_echo "$at_srcdir/classifier.at:307: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "classifier.at:307"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24355,13 +24383,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_99
-#AT_START_100
-at_fn_group_banner 100 'check-structs.at:11' \
+#AT_STOP_100
+#AT_START_101
+at_fn_group_banner 101 'check-structs.at:11' \
   "check struct tail padding" "                      " 14
 at_xfail=no
 (
-  $as_echo "100. $at_setup_line: testing $at_desc ..."
+  $as_echo "101. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -24378,7 +24406,7 @@
 $as_echo "$at_srcdir/check-structs.at:12: \$PYTHON \$top_srcdir/build-aux/check-structs test.h"
 at_fn_check_prepare_dynamic "$PYTHON $top_srcdir/build-aux/check-structs test.h" "check-structs.at:12"
 ( $at_check_trace; $PYTHON $top_srcdir/build-aux/check-structs test.h
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "test.h:3: warning: struct xyz needs 2 bytes of tail padding
@@ -24393,13 +24421,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_100
-#AT_START_101
-at_fn_group_banner 101 'check-structs.at:21' \
+#AT_STOP_101
+#AT_START_102
+at_fn_group_banner 102 'check-structs.at:21' \
   "check struct internal alignment" "                " 14
 at_xfail=no
 (
-  $as_echo "101. $at_setup_line: testing $at_desc ..."
+  $as_echo "102. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -24417,7 +24445,7 @@
 $as_echo "$at_srcdir/check-structs.at:22: \$PYTHON \$top_srcdir/build-aux/check-structs test.h"
 at_fn_check_prepare_dynamic "$PYTHON $top_srcdir/build-aux/check-structs test.h" "check-structs.at:22"
 ( $at_check_trace; $PYTHON $top_srcdir/build-aux/check-structs test.h
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "test.h:3: warning: struct xyzzy member y is 2 bytes short of 4-byte alignment
@@ -24432,13 +24460,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_101
-#AT_START_102
-at_fn_group_banner 102 'check-structs.at:32' \
+#AT_STOP_102
+#AT_START_103
+at_fn_group_banner 103 'check-structs.at:32' \
   "check struct declared size" "                     " 14
 at_xfail=no
 (
-  $as_echo "102. $at_setup_line: testing $at_desc ..."
+  $as_echo "103. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -24457,7 +24485,7 @@
 $as_echo "$at_srcdir/check-structs.at:33: \$PYTHON \$top_srcdir/build-aux/check-structs test.h"
 at_fn_check_prepare_dynamic "$PYTHON $top_srcdir/build-aux/check-structs test.h" "check-structs.at:33"
 ( $at_check_trace; $PYTHON $top_srcdir/build-aux/check-structs test.h
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "test.h:4: warning: struct wibble is 8 bytes long but declared as 12
@@ -24472,13 +24500,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_102
-#AT_START_103
-at_fn_group_banner 103 'check-structs.at:44' \
+#AT_STOP_103
+#AT_START_104
+at_fn_group_banner 104 'check-structs.at:44' \
   "check wrong struct's declared size" "             " 14
 at_xfail=no
 (
-  $as_echo "103. $at_setup_line: testing $at_desc ..."
+  $as_echo "104. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -24501,7 +24529,7 @@
 $as_echo "$at_srcdir/check-structs.at:45: \$PYTHON \$top_srcdir/build-aux/check-structs test.h"
 at_fn_check_prepare_dynamic "$PYTHON $top_srcdir/build-aux/check-structs test.h" "check-structs.at:45"
 ( $at_check_trace; $PYTHON $top_srcdir/build-aux/check-structs test.h
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "test.h:8: warning: checking size of struct moo but struct wibble was most recently defined
@@ -24516,13 +24544,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_103
-#AT_START_104
-at_fn_group_banner 104 'daemon.at:3' \
+#AT_STOP_104
+#AT_START_105
+at_fn_group_banner 105 'daemon.at:3' \
   "daemon" "                                         " 15
 at_xfail=no
 (
-  $as_echo "104. $at_setup_line: testing $at_desc ..."
+  $as_echo "105. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon.at:4" >"$at_check_line_file"
@@ -24533,7 +24561,7 @@
 $as_echo "$at_srcdir/daemon.at:5: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "daemon.at:5"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -24554,7 +24582,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -24571,7 +24599,7 @@
 $as_echo "$at_srcdir/daemon.at:10: ovsdb-server --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db 2>/dev/null & echo \$! > expected"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:10"
 ( $at_check_trace; ovsdb-server --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db 2>/dev/null & echo $! > expected
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24590,7 +24618,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -24608,7 +24636,7 @@
 $as_echo "$at_srcdir/daemon.at:12: pid=\`cat pid\` && expected=\`cat expected\` && test \"\$pid\" = \"\$expected\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:12"
 ( $at_check_trace; pid=`cat pid` && expected=`cat expected` && test "$pid" = "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24626,7 +24654,7 @@
 $as_echo "$at_srcdir/daemon.at:15: kill -0 \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:15"
 ( $at_check_trace; kill -0 `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24650,7 +24678,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat expected`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -24665,7 +24693,7 @@
 $as_echo "$at_srcdir/daemon.at:19: test ! -e pid"
 at_fn_check_prepare_trace "daemon.at:19"
 ( $at_check_trace; test ! -e pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24680,13 +24708,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_104
-#AT_START_105
-at_fn_group_banner 105 'daemon.at:22' \
+#AT_STOP_105
+#AT_START_106
+at_fn_group_banner 106 'daemon.at:22' \
   "daemon --monitor" "                               " 15
 at_xfail=no
 (
-  $as_echo "105. $at_setup_line: testing $at_desc ..."
+  $as_echo "106. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon.at:23" >"$at_check_line_file"
@@ -24697,7 +24725,7 @@
 $as_echo "$at_srcdir/daemon.at:24: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "daemon.at:24"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -24718,7 +24746,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -24736,7 +24764,7 @@
 $as_echo "$at_srcdir/daemon.at:30: ovsdb-server --monitor --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db 2>/dev/null & echo \$! > parent"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:30"
 ( $at_check_trace; ovsdb-server --monitor --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db 2>/dev/null & echo $! > parent
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24757,7 +24785,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -24779,7 +24807,7 @@
 $as_echo "$at_srcdir/daemon.at:34: kill -0 \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:34"
 ( $at_check_trace; kill -0 `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24799,7 +24827,7 @@
 $as_echo "$at_srcdir/daemon.at:35: ps -o ppid= -p \`cat pid\` > parentpid"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:35"
 ( $at_check_trace; ps -o ppid= -p `cat pid` > parentpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24823,7 +24851,7 @@
 ( $at_check_trace; parentpid=`cat parentpid` &&
    parent=`cat parent` &&
    test $parentpid = $parent
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24849,7 +24877,7 @@
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl --timeout=10 -t "`pwd`/unixctl" version
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -24871,7 +24899,7 @@
 $as_echo "$at_srcdir/daemon.at:49: cp pid oldpid"
 at_fn_check_prepare_trace "daemon.at:49"
 ( $at_check_trace; cp pid oldpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24891,7 +24919,7 @@
 $as_echo "$at_srcdir/daemon.at:50: kill -SEGV \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:50"
 ( $at_check_trace; kill -SEGV `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -24915,7 +24943,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat oldpid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -24939,7 +24967,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s pid && test `cat pid` != `cat oldpid`
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -24959,7 +24987,7 @@
 $as_echo "$at_srcdir/daemon.at:54: cp pid newpid"
 at_fn_check_prepare_trace "daemon.at:54"
 ( $at_check_trace; cp pid newpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -24981,7 +25009,7 @@
 $as_echo "$at_srcdir/daemon.at:57: ps -o ppid= -p \`cat pid\` > parentpid"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:57"
 ( $at_check_trace; ps -o ppid= -p `cat pid` > parentpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25005,7 +25033,7 @@
 ( $at_check_trace; parentpid=`cat parentpid` &&
    parent=`cat parent` &&
    test $parentpid = $parent
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25027,7 +25055,7 @@
 $as_echo "$at_srcdir/daemon.at:66: kill \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:66"
 ( $at_check_trace; kill `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25051,7 +25079,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat parent` || kill -0 `cat newpid` || test -e pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25071,13 +25099,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_105
-#AT_START_106
-at_fn_group_banner 106 'daemon.at:71' \
+#AT_STOP_106
+#AT_START_107
+at_fn_group_banner 107 'daemon.at:71' \
   "daemon --detach" "                                " 15
 at_xfail=no
 (
-  $as_echo "106. $at_setup_line: testing $at_desc ..."
+  $as_echo "107. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -25086,7 +25114,7 @@
 $as_echo "$at_srcdir/daemon.at:73: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "daemon.at:73"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25108,7 +25136,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25125,7 +25153,7 @@
 $as_echo "$at_srcdir/daemon.at:77: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:77"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25139,7 +25167,7 @@
 $as_echo "$at_srcdir/daemon.at:78: test -s pid"
 at_fn_check_prepare_trace "daemon.at:78"
 ( $at_check_trace; test -s pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25153,7 +25181,7 @@
 $as_echo "$at_srcdir/daemon.at:79: kill -0 \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:79"
 ( $at_check_trace; kill -0 `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25181,7 +25209,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat saved-pid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25195,7 +25223,7 @@
 $as_echo "$at_srcdir/daemon.at:91: test ! -e pid"
 at_fn_check_prepare_trace "daemon.at:91"
 ( $at_check_trace; test ! -e pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25209,13 +25237,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_106
-#AT_START_107
-at_fn_group_banner 107 'daemon.at:94' \
+#AT_STOP_107
+#AT_START_108
+at_fn_group_banner 108 'daemon.at:94' \
   "daemon --detach --monitor" "                      " 15
 at_xfail=no
 (
-  $as_echo "107. $at_setup_line: testing $at_desc ..."
+  $as_echo "108. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon.at:95" >"$at_check_line_file"
@@ -25227,7 +25255,7 @@
 $as_echo "$at_srcdir/daemon.at:98: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "daemon.at:98"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25248,7 +25276,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25270,7 +25298,7 @@
 $as_echo "$at_srcdir/daemon.at:108: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/daemon --monitor --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:108"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/daemon --monitor --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25289,7 +25317,7 @@
 $as_echo "$at_srcdir/daemon.at:109: test -s daemon"
 at_fn_check_prepare_trace "daemon.at:109"
 ( $at_check_trace; test -s daemon
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25311,7 +25339,7 @@
 $as_echo "$at_srcdir/daemon.at:113: kill -0 \`cat daemon\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:113"
 ( $at_check_trace; kill -0 `cat daemon`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25333,7 +25361,7 @@
 $as_echo "$at_srcdir/daemon.at:114: ps -o ppid= -p \`cat daemon\` > monitor"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:114"
 ( $at_check_trace; ps -o ppid= -p `cat daemon` > monitor
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25355,7 +25383,7 @@
 $as_echo "$at_srcdir/daemon.at:115: kill -0 \`cat monitor\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:115"
 ( $at_check_trace; kill -0 `cat monitor`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25377,7 +25405,7 @@
 $as_echo "$at_srcdir/daemon.at:116: ps -o ppid= -p \`cat monitor\` > init"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:116"
 ( $at_check_trace; ps -o ppid= -p `cat monitor` > init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25399,7 +25427,7 @@
 $as_echo "$at_srcdir/daemon.at:117: test \`cat init\` != \$\$"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:117"
 ( $at_check_trace; test `cat init` != $$
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25423,7 +25451,7 @@
 $as_echo "$at_srcdir/daemon.at:120: cp daemon olddaemon"
 at_fn_check_prepare_trace "daemon.at:120"
 ( $at_check_trace; cp daemon olddaemon
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25445,7 +25473,7 @@
 $as_echo "$at_srcdir/daemon.at:121: kill -SEGV \`cat daemon\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:121"
 ( $at_check_trace; kill -SEGV `cat daemon`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25471,7 +25499,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat olddaemon`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25497,7 +25525,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s daemon && test `cat daemon` != `cat olddaemon`
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25519,7 +25547,7 @@
 $as_echo "$at_srcdir/daemon.at:125: cp daemon newdaemon"
 at_fn_check_prepare_trace "daemon.at:125"
 ( $at_check_trace; cp daemon newdaemon
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25543,7 +25571,7 @@
 $as_echo "$at_srcdir/daemon.at:128: kill -0 \`cat daemon\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:128"
 ( $at_check_trace; kill -0 `cat daemon`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25565,7 +25593,7 @@
 $as_echo "$at_srcdir/daemon.at:129: diff olddaemon newdaemon"
 at_fn_check_prepare_trace "daemon.at:129"
 ( $at_check_trace; diff olddaemon newdaemon
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25587,7 +25615,7 @@
 $as_echo "$at_srcdir/daemon.at:130: ps -o ppid= -p \`cat daemon\` > newmonitor"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:130"
 ( $at_check_trace; ps -o ppid= -p `cat daemon` > newmonitor
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25609,7 +25637,7 @@
 $as_echo "$at_srcdir/daemon.at:131: diff monitor newmonitor"
 at_fn_check_prepare_trace "daemon.at:131"
 ( $at_check_trace; diff monitor newmonitor
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25631,7 +25659,7 @@
 $as_echo "$at_srcdir/daemon.at:132: kill -0 \`cat newmonitor\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:132"
 ( $at_check_trace; kill -0 `cat newmonitor`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25653,7 +25681,7 @@
 $as_echo "$at_srcdir/daemon.at:133: ps -o ppid= -p \`cat newmonitor\` > init"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:133"
 ( $at_check_trace; ps -o ppid= -p `cat newmonitor` > init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25675,7 +25703,7 @@
 $as_echo "$at_srcdir/daemon.at:134: test \`cat init\` != \$\$"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:134"
 ( $at_check_trace; test `cat init` != $$
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25699,7 +25727,7 @@
 $as_echo "$at_srcdir/daemon.at:137: kill \`cat daemon\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:137"
 ( $at_check_trace; kill `cat daemon`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25725,7 +25753,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat monitor` || kill -0 `cat newdaemon` || test -e daemon; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25748,13 +25776,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_107
-#AT_START_108
-at_fn_group_banner 108 'daemon.at:144' \
+#AT_STOP_108
+#AT_START_109
+at_fn_group_banner 109 'daemon.at:144' \
   "daemon --detach startup errors" "                 " 15
 at_xfail=no
 (
-  $as_echo "108. $at_setup_line: testing $at_desc ..."
+  $as_echo "109. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -25763,7 +25791,7 @@
 $as_echo "$at_srcdir/daemon.at:146: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "daemon.at:146"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25785,7 +25813,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25799,7 +25827,7 @@
 $as_echo "$at_srcdir/daemon.at:147: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --unixctl=\"\`pwd\`\"/nonexistent/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:147"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --unixctl="`pwd`"/nonexistent/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -25813,7 +25841,7 @@
 $as_echo "$at_srcdir/daemon.at:148: grep 'ovsdb-server: could not initialize control socket' stderr"
 at_fn_check_prepare_trace "daemon.at:148"
 ( $at_check_trace; grep 'ovsdb-server: could not initialize control socket' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25827,7 +25855,7 @@
 $as_echo "$at_srcdir/daemon.at:150: test ! -s pid"
 at_fn_check_prepare_trace "daemon.at:150"
 ( $at_check_trace; test ! -s pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25841,13 +25869,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_108
-#AT_START_109
-at_fn_group_banner 109 'daemon.at:153' \
+#AT_STOP_109
+#AT_START_110
+at_fn_group_banner 110 'daemon.at:153' \
   "daemon --detach --monitor startup errors" "       " 15
 at_xfail=no
 (
-  $as_echo "109. $at_setup_line: testing $at_desc ..."
+  $as_echo "110. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon.at:154" >"$at_check_line_file"
@@ -25859,7 +25887,7 @@
 $as_echo "$at_srcdir/daemon.at:156: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "daemon.at:156"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25881,7 +25909,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25895,7 +25923,7 @@
 $as_echo "$at_srcdir/daemon.at:157: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --monitor --unixctl=\"\`pwd\`\"/nonexistent/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:157"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --monitor --unixctl="`pwd`"/nonexistent/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -25909,7 +25937,7 @@
 $as_echo "$at_srcdir/daemon.at:158: grep 'ovsdb-server: could not initialize control socket' stderr"
 at_fn_check_prepare_trace "daemon.at:158"
 ( $at_check_trace; grep 'ovsdb-server: could not initialize control socket' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25923,7 +25951,7 @@
 $as_echo "$at_srcdir/daemon.at:160: test ! -s pid"
 at_fn_check_prepare_trace "daemon.at:160"
 ( $at_check_trace; test ! -s pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -25937,13 +25965,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_109
-#AT_START_110
-at_fn_group_banner 110 'daemon.at:163' \
+#AT_STOP_110
+#AT_START_111
+at_fn_group_banner 111 'daemon.at:163' \
   "daemon --service" "                               " 15
 at_xfail=no
 (
-  $as_echo "110. $at_setup_line: testing $at_desc ..."
+  $as_echo "111. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -25955,7 +25983,7 @@
 $as_echo "$at_srcdir/daemon.at:166: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "daemon.at:166"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25976,7 +26004,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -25993,7 +26021,7 @@
 $as_echo "$at_srcdir/daemon.at:171: sc create ovsdb-server binpath=\"\$abs_path/ovsdb-server \`pwd\`/db --log-file=\`pwd\`/ovsdb-server.log --pidfile=\`pwd\`/pid --remote=punix:\`pwd\`/socket --unixctl=\`pwd\`/unixctl --service\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:171"
 ( $at_check_trace; sc create ovsdb-server binpath="$abs_path/ovsdb-server `pwd`/db --log-file=`pwd`/ovsdb-server.log --pidfile=`pwd`/pid --remote=punix:`pwd`/socket --unixctl=`pwd`/unixctl --service"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26010,7 +26038,7 @@
 $as_echo "$at_srcdir/daemon.at:175: sc start ovsdb-server"
 at_fn_check_prepare_trace "daemon.at:175"
 ( $at_check_trace; sc start ovsdb-server
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26028,7 +26056,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26046,7 +26074,7 @@
 ( $at_check_trace; ovs_wait_cond () { sc query ovsdb-server | grep STATE | grep RUNNING > /dev/null 2>&1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26060,7 +26088,7 @@
 $as_echo "$at_srcdir/daemon.at:178: kill -0 \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:178"
 ( $at_check_trace; kill -0 `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26074,7 +26102,7 @@
 $as_echo "$at_srcdir/daemon.at:179: ovs-appctl -t \`pwd\`/unixctl ovsdb-server/list-dbs"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon.at:179"
 ( $at_check_trace; ovs-appctl -t `pwd`/unixctl ovsdb-server/list-dbs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26090,7 +26118,7 @@
 $as_echo "$at_srcdir/daemon.at:182: sc stop ovsdb-server"
 at_fn_check_prepare_trace "daemon.at:182"
 ( $at_check_trace; sc stop ovsdb-server
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26108,7 +26136,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -s pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26122,7 +26150,7 @@
 $as_echo "$at_srcdir/daemon.at:184: sc query ovsdb-server | grep STATE | grep STOPPED"
 at_fn_check_prepare_notrace 'a shell pipeline' "daemon.at:184"
 ( $at_check_trace; sc query ovsdb-server | grep STATE | grep STOPPED
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26136,7 +26164,7 @@
 $as_echo "$at_srcdir/daemon.at:185: sc delete ovsdb-server"
 at_fn_check_prepare_trace "daemon.at:185"
 ( $at_check_trace; sc delete ovsdb-server
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26152,13 +26180,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_110
-#AT_START_111
-at_fn_group_banner 111 'daemon-py.at:3' \
+#AT_STOP_111
+#AT_START_112
+at_fn_group_banner 112 'daemon-py.at:3' \
   "daemon - Python" "                                " 16
 at_xfail=no
 (
-  $as_echo "111. $at_setup_line: testing $at_desc ..."
+  $as_echo "112. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon-py.at:4" >"$at_check_line_file"
@@ -26172,7 +26200,7 @@
 $as_echo "$at_srcdir/daemon-py.at:9: \$PYTHON \$srcdir/test-daemon.py --pidfile=\`pwd\`/pid& echo \$! > expected"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:9"
 ( $at_check_trace; $PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid& echo $! > expected
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26191,7 +26219,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26209,7 +26237,7 @@
 $as_echo "$at_srcdir/daemon-py.at:11: pid=\`cat pid\` && expected=\`cat expected\` && test \"\$pid\" = \"\$expected\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:11"
 ( $at_check_trace; pid=`cat pid` && expected=`cat expected` && test "$pid" = "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26227,7 +26255,7 @@
 $as_echo "$at_srcdir/daemon-py.at:14: kill -0 \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:14"
 ( $at_check_trace; kill -0 `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26251,7 +26279,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat expected`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26266,7 +26294,7 @@
 $as_echo "$at_srcdir/daemon-py.at:18: test ! -e pid"
 at_fn_check_prepare_trace "daemon-py.at:18"
 ( $at_check_trace; test ! -e pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26281,13 +26309,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_111
-#AT_START_112
-at_fn_group_banner 112 'daemon-py.at:21' \
+#AT_STOP_112
+#AT_START_113
+at_fn_group_banner 113 'daemon-py.at:21' \
   "daemon --monitor - Python" "                      " 16
 at_xfail=no
 (
-  $as_echo "112. $at_setup_line: testing $at_desc ..."
+  $as_echo "113. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon-py.at:22" >"$at_check_line_file"
@@ -26302,7 +26330,7 @@
 $as_echo "$at_srcdir/daemon-py.at:28: \$PYTHON \$srcdir/test-daemon.py --pidfile=\`pwd\`/pid --monitor& echo \$! > parent"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:28"
 ( $at_check_trace; $PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid --monitor& echo $! > parent
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26323,7 +26351,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26345,7 +26373,7 @@
 $as_echo "$at_srcdir/daemon-py.at:32: kill -0 \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:32"
 ( $at_check_trace; kill -0 `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26365,7 +26393,7 @@
 $as_echo "$at_srcdir/daemon-py.at:33: ps -o ppid= -p \`cat pid\` > parentpid"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:33"
 ( $at_check_trace; ps -o ppid= -p `cat pid` > parentpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26389,7 +26417,7 @@
 ( $at_check_trace; parentpid=`cat parentpid` &&
    parent=`cat parent` &&
    test $parentpid = $parent
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26411,7 +26439,7 @@
 $as_echo "$at_srcdir/daemon-py.at:42: cp pid oldpid"
 at_fn_check_prepare_trace "daemon-py.at:42"
 ( $at_check_trace; cp pid oldpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26431,7 +26459,7 @@
 $as_echo "$at_srcdir/daemon-py.at:43: kill -SEGV \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:43"
 ( $at_check_trace; kill -SEGV `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26455,7 +26483,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat oldpid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26479,7 +26507,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s pid && test `cat pid` != `cat oldpid`
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26499,7 +26527,7 @@
 $as_echo "$at_srcdir/daemon-py.at:47: cp pid newpid"
 at_fn_check_prepare_trace "daemon-py.at:47"
 ( $at_check_trace; cp pid newpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26521,7 +26549,7 @@
 $as_echo "$at_srcdir/daemon-py.at:50: ps -o ppid= -p \`cat pid\` > parentpid"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:50"
 ( $at_check_trace; ps -o ppid= -p `cat pid` > parentpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26545,7 +26573,7 @@
 ( $at_check_trace; parentpid=`cat parentpid` &&
    parent=`cat parent` &&
    test $parentpid = $parent
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26567,7 +26595,7 @@
 $as_echo "$at_srcdir/daemon-py.at:59: kill \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:59"
 ( $at_check_trace; kill `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26591,7 +26619,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat parent` || kill -0 `cat newpid` || test -e pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26611,13 +26639,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_112
-#AT_START_113
-at_fn_group_banner 113 'daemon-py.at:64' \
+#AT_STOP_113
+#AT_START_114
+at_fn_group_banner 114 'daemon-py.at:64' \
   "daemon --monitor restart exit code - Python" "    " 16
 at_xfail=no
 (
-  $as_echo "113. $at_setup_line: testing $at_desc ..."
+  $as_echo "114. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon-py.at:65" >"$at_check_line_file"
@@ -26632,7 +26660,7 @@
 $as_echo "$at_srcdir/daemon-py.at:71: \$PYTHON \$srcdir/test-daemon.py --pidfile=\`pwd\`/pid --monitor& echo \$! > parent"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:71"
 ( $at_check_trace; $PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid --monitor& echo $! > parent
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26653,7 +26681,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26675,7 +26703,7 @@
 $as_echo "$at_srcdir/daemon-py.at:75: kill -0 \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:75"
 ( $at_check_trace; kill -0 `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26695,7 +26723,7 @@
 $as_echo "$at_srcdir/daemon-py.at:76: ps -o ppid= -p \`cat pid\` > parentpid"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:76"
 ( $at_check_trace; ps -o ppid= -p `cat pid` > parentpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26719,7 +26747,7 @@
 ( $at_check_trace; parentpid=`cat parentpid` &&
    parent=`cat parent` &&
    test $parentpid = $parent
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26741,7 +26769,7 @@
 $as_echo "$at_srcdir/daemon-py.at:85: cp pid oldpid"
 at_fn_check_prepare_trace "daemon-py.at:85"
 ( $at_check_trace; cp pid oldpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26761,7 +26789,7 @@
 $as_echo "$at_srcdir/daemon-py.at:86: kill -HUP \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:86"
 ( $at_check_trace; kill -HUP `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26785,7 +26813,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat oldpid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26809,7 +26837,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s pid && test `cat pid` != `cat oldpid`
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26829,7 +26857,7 @@
 $as_echo "$at_srcdir/daemon-py.at:90: cp pid newpid"
 at_fn_check_prepare_trace "daemon-py.at:90"
 ( $at_check_trace; cp pid newpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26851,7 +26879,7 @@
 $as_echo "$at_srcdir/daemon-py.at:93: ps -o ppid= -p \`cat pid\` > parentpid"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:93"
 ( $at_check_trace; ps -o ppid= -p `cat pid` > parentpid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26875,7 +26903,7 @@
 ( $at_check_trace; parentpid=`cat parentpid` &&
    parent=`cat parent` &&
    test $parentpid = $parent
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26897,7 +26925,7 @@
 $as_echo "$at_srcdir/daemon-py.at:102: kill \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:102"
 ( $at_check_trace; kill `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26921,7 +26949,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat parent` || kill -0 `cat newpid` || test -e pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -26941,13 +26969,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_113
-#AT_START_114
-at_fn_group_banner 114 'daemon-py.at:107' \
+#AT_STOP_114
+#AT_START_115
+at_fn_group_banner 115 'daemon-py.at:107' \
   "daemon --detach - Python" "                       " 16
 at_xfail=no
 (
-  $as_echo "114. $at_setup_line: testing $at_desc ..."
+  $as_echo "115. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon-py.at:108" >"$at_check_line_file"
@@ -26961,7 +26989,7 @@
 $as_echo "$at_srcdir/daemon-py.at:113: \$PYTHON \$srcdir/test-daemon.py --pidfile=\`pwd\`/pid --detach"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:113"
 ( $at_check_trace; $PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid --detach
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26975,7 +27003,7 @@
 $as_echo "$at_srcdir/daemon-py.at:114: test -s pid"
 at_fn_check_prepare_trace "daemon-py.at:114"
 ( $at_check_trace; test -s pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -26989,7 +27017,7 @@
 $as_echo "$at_srcdir/daemon-py.at:115: kill -0 \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:115"
 ( $at_check_trace; kill -0 `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27010,7 +27038,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat saved-pid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -27024,7 +27052,7 @@
 $as_echo "$at_srcdir/daemon-py.at:120: test ! -e pid"
 at_fn_check_prepare_trace "daemon-py.at:120"
 ( $at_check_trace; test ! -e pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27038,13 +27066,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_114
-#AT_START_115
-at_fn_group_banner 115 'daemon-py.at:123' \
+#AT_STOP_115
+#AT_START_116
+at_fn_group_banner 116 'daemon-py.at:123' \
   "daemon --detach --monitor - Python" "             " 16
 at_xfail=no
 (
-  $as_echo "115. $at_setup_line: testing $at_desc ..."
+  $as_echo "116. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon-py.at:124" >"$at_check_line_file"
@@ -27064,7 +27092,7 @@
 $as_echo "$at_srcdir/daemon-py.at:136: \$PYTHON \$srcdir/test-daemon.py --pidfile=\`pwd\`/daemon --detach --monitor"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:136"
 ( $at_check_trace; $PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/daemon --detach --monitor
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27083,7 +27111,7 @@
 $as_echo "$at_srcdir/daemon-py.at:137: test -s daemon"
 at_fn_check_prepare_trace "daemon-py.at:137"
 ( $at_check_trace; test -s daemon
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27105,7 +27133,7 @@
 $as_echo "$at_srcdir/daemon-py.at:141: kill -0 \`cat daemon\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:141"
 ( $at_check_trace; kill -0 `cat daemon`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27127,7 +27155,7 @@
 $as_echo "$at_srcdir/daemon-py.at:142: ps -o ppid= -p \`cat daemon\` > monitor"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:142"
 ( $at_check_trace; ps -o ppid= -p `cat daemon` > monitor
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27149,7 +27177,7 @@
 $as_echo "$at_srcdir/daemon-py.at:143: kill -0 \`cat monitor\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:143"
 ( $at_check_trace; kill -0 `cat monitor`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27171,7 +27199,7 @@
 $as_echo "$at_srcdir/daemon-py.at:144: ps -o ppid= -p \`cat monitor\` > init"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:144"
 ( $at_check_trace; ps -o ppid= -p `cat monitor` > init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27193,7 +27221,7 @@
 $as_echo "$at_srcdir/daemon-py.at:145: test \`cat init\` != \$\$"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:145"
 ( $at_check_trace; test `cat init` != $$
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27217,7 +27245,7 @@
 $as_echo "$at_srcdir/daemon-py.at:148: cp daemon olddaemon"
 at_fn_check_prepare_trace "daemon-py.at:148"
 ( $at_check_trace; cp daemon olddaemon
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27239,7 +27267,7 @@
 $as_echo "$at_srcdir/daemon-py.at:149: kill -SEGV \`cat daemon\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:149"
 ( $at_check_trace; kill -SEGV `cat daemon`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -27265,7 +27293,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat olddaemon`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -27291,7 +27319,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s daemon && test `cat daemon` != `cat olddaemon`
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -27313,7 +27341,7 @@
 $as_echo "$at_srcdir/daemon-py.at:153: cp daemon newdaemon"
 at_fn_check_prepare_trace "daemon-py.at:153"
 ( $at_check_trace; cp daemon newdaemon
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27337,7 +27365,7 @@
 $as_echo "$at_srcdir/daemon-py.at:156: kill -0 \`cat daemon\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:156"
 ( $at_check_trace; kill -0 `cat daemon`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27359,7 +27387,7 @@
 $as_echo "$at_srcdir/daemon-py.at:157: diff olddaemon newdaemon"
 at_fn_check_prepare_trace "daemon-py.at:157"
 ( $at_check_trace; diff olddaemon newdaemon
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27381,7 +27409,7 @@
 $as_echo "$at_srcdir/daemon-py.at:158: ps -o ppid= -p \`cat daemon\` > newmonitor"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:158"
 ( $at_check_trace; ps -o ppid= -p `cat daemon` > newmonitor
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27403,7 +27431,7 @@
 $as_echo "$at_srcdir/daemon-py.at:159: diff monitor newmonitor"
 at_fn_check_prepare_trace "daemon-py.at:159"
 ( $at_check_trace; diff monitor newmonitor
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27425,7 +27453,7 @@
 $as_echo "$at_srcdir/daemon-py.at:160: kill -0 \`cat newmonitor\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:160"
 ( $at_check_trace; kill -0 `cat newmonitor`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27447,7 +27475,7 @@
 $as_echo "$at_srcdir/daemon-py.at:161: ps -o ppid= -p \`cat newmonitor\` > init"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:161"
 ( $at_check_trace; ps -o ppid= -p `cat newmonitor` > init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27469,7 +27497,7 @@
 $as_echo "$at_srcdir/daemon-py.at:162: test \`cat init\` != \$\$"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:162"
 ( $at_check_trace; test `cat init` != $$
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27493,7 +27521,7 @@
 $as_echo "$at_srcdir/daemon-py.at:165: kill \`cat daemon\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:165"
 ( $at_check_trace; kill `cat daemon`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -27519,7 +27547,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat monitor` || kill -0 `cat newdaemon` || test -e daemon; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -27542,13 +27570,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_115
-#AT_START_116
-at_fn_group_banner 116 'daemon-py.at:172' \
+#AT_STOP_116
+#AT_START_117
+at_fn_group_banner 117 'daemon-py.at:172' \
   "daemon --detach startup errors - Python" "        " 16
 at_xfail=no
 (
-  $as_echo "116. $at_setup_line: testing $at_desc ..."
+  $as_echo "117. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon-py.at:173" >"$at_check_line_file"
@@ -27559,7 +27587,7 @@
 $as_echo "$at_srcdir/daemon-py.at:175: \$PYTHON \$srcdir/test-daemon.py --pidfile=\`pwd\`/pid --detach --bail"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:175"
 ( $at_check_trace; $PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid --detach --bail
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -27573,7 +27601,7 @@
 $as_echo "$at_srcdir/daemon-py.at:176: grep 'test-daemon.py: exiting after daemonize_start() as requested' stderr"
 at_fn_check_prepare_trace "daemon-py.at:176"
 ( $at_check_trace; grep 'test-daemon.py: exiting after daemonize_start() as requested' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27587,7 +27615,7 @@
 $as_echo "$at_srcdir/daemon-py.at:178: test ! -s pid"
 at_fn_check_prepare_trace "daemon-py.at:178"
 ( $at_check_trace; test ! -s pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27601,13 +27629,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_116
-#AT_START_117
-at_fn_group_banner 117 'daemon-py.at:181' \
+#AT_STOP_117
+#AT_START_118
+at_fn_group_banner 118 'daemon-py.at:181' \
   "daemon --detach --monitor startup errors - Python" "" 16
 at_xfail=no
 (
-  $as_echo "117. $at_setup_line: testing $at_desc ..."
+  $as_echo "118. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon-py.at:182" >"$at_check_line_file"
@@ -27618,7 +27646,7 @@
 $as_echo "$at_srcdir/daemon-py.at:184: \$PYTHON \$srcdir/test-daemon.py --pidfile=\`pwd\`/pid --detach --monitor --bail"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:184"
 ( $at_check_trace; $PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid --detach --monitor --bail
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -27632,7 +27660,7 @@
 $as_echo "$at_srcdir/daemon-py.at:185: grep 'test-daemon.py: exiting after daemonize_start() as requested' stderr"
 at_fn_check_prepare_trace "daemon-py.at:185"
 ( $at_check_trace; grep 'test-daemon.py: exiting after daemonize_start() as requested' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27646,7 +27674,7 @@
 $as_echo "$at_srcdir/daemon-py.at:187: test ! -s pid"
 at_fn_check_prepare_trace "daemon-py.at:187"
 ( $at_check_trace; test ! -s pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27660,13 +27688,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_117
-#AT_START_118
-at_fn_group_banner 118 'daemon-py.at:190' \
+#AT_STOP_118
+#AT_START_119
+at_fn_group_banner 119 'daemon-py.at:190' \
   "daemon --detach closes standard fds - Python" "   " 16
 at_xfail=no
 (
-  $as_echo "118. $at_setup_line: testing $at_desc ..."
+  $as_echo "119. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon-py.at:191" >"$at_check_line_file"
@@ -27679,7 +27707,7 @@
 $as_echo "$at_srcdir/daemon-py.at:195: (yes 2>stderr; echo \$? > status) | \$PYTHON \$srcdir/test-daemon.py --pidfile=\`pwd\`/pid --detach"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:195"
 ( $at_check_trace; (yes 2>stderr; echo $? > status) | $PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid --detach
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27695,7 +27723,7 @@
 $as_echo "$at_srcdir/daemon-py.at:196: kill \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:196"
 ( $at_check_trace; kill `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27711,7 +27739,7 @@
 $as_echo "$at_srcdir/daemon-py.at:197: test -s status"
 at_fn_check_prepare_trace "daemon-py.at:197"
 ( $at_check_trace; test -s status
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27734,7 +27762,7 @@
 $as_echo "$at_srcdir/daemon-py.at:205: kill -l \`cat status\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:205"
 ( $at_check_trace; kill -l `cat status`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27753,13 +27781,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_118
-#AT_START_119
-at_fn_group_banner 119 'daemon-py.at:210' \
+#AT_STOP_119
+#AT_START_120
+at_fn_group_banner 120 'daemon-py.at:210' \
   "daemon --detach --monitor closes standard fds" "  " 16
 at_xfail=no
 (
-  $as_echo "119. $at_setup_line: testing $at_desc ..."
+  $as_echo "120. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "daemon-py.at:211" >"$at_check_line_file"
@@ -27773,7 +27801,7 @@
 $as_echo "$at_srcdir/daemon-py.at:215: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "daemon-py.at:215"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -27797,7 +27825,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -27813,7 +27841,7 @@
 $as_echo "$at_srcdir/daemon-py.at:216: (yes 2>stderr; echo \$? > status) | \$PYTHON \$srcdir/test-daemon.py --pidfile=\`pwd\`/pid --detach"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:216"
 ( $at_check_trace; (yes 2>stderr; echo $? > status) | $PYTHON $srcdir/test-daemon.py --pidfile=`pwd`/pid --detach
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27829,7 +27857,7 @@
 $as_echo "$at_srcdir/daemon-py.at:217: kill \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:217"
 ( $at_check_trace; kill `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27845,7 +27873,7 @@
 $as_echo "$at_srcdir/daemon-py.at:218: test -s status"
 at_fn_check_prepare_trace "daemon-py.at:218"
 ( $at_check_trace; test -s status
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27868,7 +27896,7 @@
 $as_echo "$at_srcdir/daemon-py.at:226: kill -l \`cat status\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "daemon-py.at:226"
 ( $at_check_trace; kill -l `cat status`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -27887,13 +27915,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_119
-#AT_START_120
-at_fn_group_banner 120 'ofp-actions.at:3' \
+#AT_STOP_120
+#AT_START_121
+at_fn_group_banner 121 'ofp-actions.at:3' \
   "OpenFlow 1.0 action translation" "                " 17
 at_xfail=no
 (
-  $as_echo "120. $at_setup_line: testing $at_desc ..."
+  $as_echo "121. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -28039,7 +28067,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:148: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow10 < input.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:148"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow10 < input.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -28055,13 +28083,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_120
-#AT_START_121
-at_fn_group_banner 121 'ofp-actions.at:153' \
+#AT_STOP_121
+#AT_START_122
+at_fn_group_banner 122 'ofp-actions.at:153' \
   "OpenFlow 1.0 \"instruction\" translations" "        " 17
 at_xfail=no
 (
-  $as_echo "121. $at_setup_line: testing $at_desc ..."
+  $as_echo "122. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -28090,7 +28118,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:178: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-instructions OpenFlow10 < input.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:178"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-instructions OpenFlow10 < input.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -28106,13 +28134,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_121
-#AT_START_122
-at_fn_group_banner 122 'ofp-actions.at:183' \
+#AT_STOP_122
+#AT_START_123
+at_fn_group_banner 123 'ofp-actions.at:183' \
   "OpenFlow 1.1 action translation" "                " 17
 at_xfail=no
 (
-  $as_echo "122. $at_setup_line: testing $at_desc ..."
+  $as_echo "123. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -28240,7 +28268,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:315: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow11 < input.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:315"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow11 < input.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -28256,13 +28284,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_122
-#AT_START_123
-at_fn_group_banner 123 'ofp-actions.at:320' \
+#AT_STOP_123
+#AT_START_124
+at_fn_group_banner 124 'ofp-actions.at:320' \
   "OpenFlow 1.1 instruction translation" "           " 17
 at_xfail=no
 (
-  $as_echo "123. $at_setup_line: testing $at_desc ..."
+  $as_echo "124. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -28448,7 +28476,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:524: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-instructions OpenFlow11 < input.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:524"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-instructions OpenFlow11 < input.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -28464,13 +28492,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_123
-#AT_START_124
-at_fn_group_banner 124 'ofp-actions.at:531' \
+#AT_STOP_124
+#AT_START_125
+at_fn_group_banner 125 'ofp-actions.at:531' \
   "OpenFlow 1.2 action translation" "                " 17
 at_xfail=no
 (
-  $as_echo "124. $at_setup_line: testing $at_desc ..."
+  $as_echo "125. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -28496,7 +28524,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:550: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow12 < input.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:550"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow12 < input.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -28512,13 +28540,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_124
-#AT_START_125
-at_fn_group_banner 125 'ofp-actions.at:557' \
+#AT_STOP_125
+#AT_START_126
+at_fn_group_banner 126 'ofp-actions.at:557' \
   "OpenFlow 1.3 action translation" "                " 17
 at_xfail=no
 (
-  $as_echo "125. $at_setup_line: testing $at_desc ..."
+  $as_echo "126. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -28544,7 +28572,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:578: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow13 < input.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:578"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow13 < input.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -28560,13 +28588,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_125
-#AT_START_126
-at_fn_group_banner 126 'ofp-actions.at:585' \
+#AT_STOP_126
+#AT_START_127
+at_fn_group_banner 127 'ofp-actions.at:585' \
   "OpenFlow 1.5 action translation" "                " 17
 at_xfail=no
 (
-  $as_echo "126. $at_setup_line: testing $at_desc ..."
+  $as_echo "127. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -28592,7 +28620,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:604: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow15 < input.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:604"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow15 < input.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -28608,13 +28636,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_126
-#AT_START_127
-at_fn_group_banner 127 'ofp-actions.at:609' \
+#AT_STOP_127
+#AT_START_128
+at_fn_group_banner 128 'ofp-actions.at:609' \
   "ofp-actions - inconsistent MPLS actions" "        " 17
 at_xfail=no
 (
-  $as_echo "127. $at_setup_line: testing $at_desc ..."
+  $as_echo "128. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -28627,7 +28655,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:610: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofp-actions.at:610"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28641,7 +28669,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:610: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofp-actions.at:610"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -28663,7 +28691,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28678,7 +28706,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:610: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofp-actions.at:610"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28693,7 +28721,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:610: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofp-actions.at:610"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -28725,7 +28753,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28742,7 +28770,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:610: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofp-actions.at:610"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28758,7 +28786,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:612: ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=fin_timeout(idle_timeout=1)'"
 at_fn_check_prepare_trace "ofp-actions.at:612"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=fin_timeout(idle_timeout=1)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28773,7 +28801,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:614: ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=push_mpls:0x8847,fin_timeout(idle_timeout=1)'"
 at_fn_check_prepare_trace "ofp-actions.at:614"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=push_mpls:0x8847,fin_timeout(idle_timeout=1)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: none of the usable flow formats (OpenFlow10,NXM) is among the allowed flow formats (OpenFlow11)
@@ -28790,7 +28818,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:618: check_logs "
 at_fn_check_prepare_trace "ofp-actions.at:618"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28805,7 +28833,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:618: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofp-actions.at:618"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28820,7 +28848,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:618: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofp-actions.at:618"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28835,13 +28863,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_127
-#AT_START_128
-at_fn_group_banner 128 'ofp-actions.at:621' \
+#AT_STOP_128
+#AT_START_129
+at_fn_group_banner 129 'ofp-actions.at:621' \
   "reg_load <-> set_field translation corner case" " " 17
 at_xfail=no
 (
-  $as_echo "128. $at_setup_line: testing $at_desc ..."
+  $as_echo "129. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -28855,7 +28883,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:623: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofp-actions.at:623"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28869,7 +28897,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:623: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofp-actions.at:623"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -28891,7 +28919,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28906,7 +28934,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:623: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofp-actions.at:623"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28921,7 +28949,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:623: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofp-actions.at:623"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -28953,7 +28981,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28970,7 +28998,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:623: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofp-actions.at:623"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -28986,7 +29014,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:628: ovs-ofctl -O OpenFlow13 add-flow br0 mpls,actions=set_field:10-\\>mpls_label"
 at_fn_check_prepare_trace "ofp-actions.at:628"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 add-flow br0 mpls,actions=set_field:10-\>mpls_label
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29001,7 +29029,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:629: ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:629"
 ( $at_check_trace; ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29019,7 +29047,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:633: check_logs "
 at_fn_check_prepare_trace "ofp-actions.at:633"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29034,7 +29062,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:633: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofp-actions.at:633"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29049,7 +29077,7 @@
 $as_echo "$at_srcdir/ofp-actions.at:633: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofp-actions.at:633"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29064,13 +29092,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_128
-#AT_START_129
-at_fn_group_banner 129 'ofp-print.at:3' \
+#AT_STOP_129
+#AT_START_130
+at_fn_group_banner 130 'ofp-print.at:3' \
   "empty" "                                          " 18
 at_xfail=no
 (
-  $as_echo "129. $at_setup_line: testing $at_desc ..."
+  $as_echo "130. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29078,7 +29106,7 @@
 $as_echo "$at_srcdir/ofp-print.at:5: ovs-ofctl ofp-print ''"
 at_fn_check_prepare_trace "ofp-print.at:5"
 ( $at_check_trace; ovs-ofctl ofp-print ''
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29093,13 +29121,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_129
-#AT_START_130
-at_fn_group_banner 130 'ofp-print.at:9' \
+#AT_STOP_130
+#AT_START_131
+at_fn_group_banner 131 'ofp-print.at:9' \
   "too short" "                                      " 18
 at_xfail=no
 (
-  $as_echo "130. $at_setup_line: testing $at_desc ..."
+  $as_echo "131. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29107,7 +29135,7 @@
 $as_echo "$at_srcdir/ofp-print.at:11: ovs-ofctl ofp-print aabb"
 at_fn_check_prepare_trace "ofp-print.at:11"
 ( $at_check_trace; ovs-ofctl ofp-print aabb
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29123,13 +29151,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_130
-#AT_START_131
-at_fn_group_banner 131 'ofp-print.at:17' \
+#AT_STOP_131
+#AT_START_132
+at_fn_group_banner 132 'ofp-print.at:17' \
   "wrong OpenFlow version" "                         " 18
 at_xfail=no
 (
-  $as_echo "131. $at_setup_line: testing $at_desc ..."
+  $as_echo "132. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29137,7 +29165,7 @@
 $as_echo "$at_srcdir/ofp-print.at:19: ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print 00bb0008eeff0011"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-print.at:19"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print 00bb0008eeff0011
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ofp_msgs|WARN|unknown OpenFlow message (version 0, type 187)
@@ -29155,13 +29183,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_131
-#AT_START_132
-at_fn_group_banner 132 'ofp-print.at:27' \
+#AT_STOP_132
+#AT_START_133
+at_fn_group_banner 133 'ofp-print.at:27' \
   "truncated message" "                              " 18
 at_xfail=no
 (
-  $as_echo "132. $at_setup_line: testing $at_desc ..."
+  $as_echo "133. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29169,7 +29197,7 @@
 $as_echo "$at_srcdir/ofp-print.at:29: ovs-ofctl ofp-print 0110ccddeeff0011"
 at_fn_check_prepare_trace "ofp-print.at:29"
 ( $at_check_trace; ovs-ofctl ofp-print 0110ccddeeff0011
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29185,13 +29213,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_132
-#AT_START_133
-at_fn_group_banner 133 'ofp-print.at:35' \
+#AT_STOP_133
+#AT_START_134
+at_fn_group_banner 134 'ofp-print.at:35' \
   "message only uses part of buffer" "               " 18
 at_xfail=no
 (
-  $as_echo "133. $at_setup_line: testing $at_desc ..."
+  $as_echo "134. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29199,7 +29227,7 @@
 $as_echo "$at_srcdir/ofp-print.at:37: ovs-ofctl ofp-print 01100009eeff00112233"
 at_fn_check_prepare_trace "ofp-print.at:37"
 ( $at_check_trace; ovs-ofctl ofp-print 01100009eeff00112233
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29216,13 +29244,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_133
-#AT_START_134
-at_fn_group_banner 134 'ofp-print.at:44' \
+#AT_STOP_134
+#AT_START_135
+at_fn_group_banner 135 'ofp-print.at:44' \
   "OFPT_HELLO - ordinary" "                          " 18
 at_xfail=no
 (
-  $as_echo "134. $at_setup_line: testing $at_desc ..."
+  $as_echo "135. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29230,7 +29258,7 @@
 $as_echo "$at_srcdir/ofp-print.at:46: ovs-ofctl ofp-print 0100000800000000"
 at_fn_check_prepare_trace "ofp-print.at:46"
 ( $at_check_trace; ovs-ofctl ofp-print 0100000800000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29246,13 +29274,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_134
-#AT_START_135
-at_fn_group_banner 135 'ofp-print.at:52' \
+#AT_STOP_135
+#AT_START_136
+at_fn_group_banner 136 'ofp-print.at:52' \
   "OFPT_HELLO with extra data" "                     " 18
 at_xfail=no
 (
-  $as_echo "135. $at_setup_line: testing $at_desc ..."
+  $as_echo "136. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29260,7 +29288,7 @@
 $as_echo "$at_srcdir/ofp-print.at:54: ovs-ofctl ofp-print 0100001300000000657874726120646174610a"
 at_fn_check_prepare_trace "ofp-print.at:54"
 ( $at_check_trace; ovs-ofctl ofp-print 0100001300000000657874726120646174610a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29279,13 +29307,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_135
-#AT_START_136
-at_fn_group_banner 136 'ofp-print.at:64' \
+#AT_STOP_136
+#AT_START_137
+at_fn_group_banner 137 'ofp-print.at:64' \
   "OFPT_HELLO with version bitmap" "                 " 18
 at_xfail=no
 (
-  $as_echo "136. $at_setup_line: testing $at_desc ..."
+  $as_echo "137. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29293,7 +29321,7 @@
 $as_echo "$at_srcdir/ofp-print.at:66: ovs-ofctl ofp-print \"01 00 00 10 00 00 00 00 00 01 00 08 00 00 00 f0\""
 at_fn_check_prepare_trace "ofp-print.at:66"
 ( $at_check_trace; ovs-ofctl ofp-print "01 00 00 10 00 00 00 00 00 01 00 08 00 00 00 f0"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29309,13 +29337,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_136
-#AT_START_137
-at_fn_group_banner 137 'ofp-print.at:73' \
+#AT_STOP_137
+#AT_START_138
+at_fn_group_banner 138 'ofp-print.at:73' \
   "OFPT_HELLO with version bitmap and extra data" "  " 18
 at_xfail=no
 (
-  $as_echo "137. $at_setup_line: testing $at_desc ..."
+  $as_echo "138. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29327,7 +29355,7 @@
 ( $at_check_trace; ovs-ofctl ofp-print "\
 01 00 00 1b 00 00 00 00 ff ff 00 06 01 02 00 00 \
 00 01 00 08 00 00 00 f0 61 62 63"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29346,13 +29374,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_137
-#AT_START_138
-at_fn_group_banner 138 'ofp-print.at:87' \
+#AT_STOP_138
+#AT_START_139
+at_fn_group_banner 139 'ofp-print.at:87' \
   "OFPT_HELLO with higher than supported version" "  " 18
 at_xfail=no
 (
-  $as_echo "138. $at_setup_line: testing $at_desc ..."
+  $as_echo "139. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29360,7 +29388,7 @@
 $as_echo "$at_srcdir/ofp-print.at:89: ovs-ofctl ofp-print \"0f 00 00 08 00 00 00 00\""
 at_fn_check_prepare_trace "ofp-print.at:89"
 ( $at_check_trace; ovs-ofctl ofp-print "0f 00 00 08 00 00 00 00"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29376,7 +29404,7 @@
 $as_echo "$at_srcdir/ofp-print.at:94: ovs-ofctl ofp-print \"40 00 00 08 00 00 00 00\""
 at_fn_check_prepare_trace "ofp-print.at:94"
 ( $at_check_trace; ovs-ofctl ofp-print "40 00 00 08 00 00 00 00"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29392,7 +29420,7 @@
 $as_echo "$at_srcdir/ofp-print.at:99: ovs-ofctl ofp-print \"3f 00 00 18 00 00 00 00 00 01 00 0c aa aa aa aa aa aa aa aa 00 00 00 00\""
 at_fn_check_prepare_trace "ofp-print.at:99"
 ( $at_check_trace; ovs-ofctl ofp-print "3f 00 00 18 00 00 00 00 00 01 00 0c aa aa aa aa aa aa aa aa 00 00 00 00"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29408,13 +29436,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_138
-#AT_START_139
-at_fn_group_banner 139 'ofp-print.at:106' \
+#AT_STOP_139
+#AT_START_140
+at_fn_group_banner 140 'ofp-print.at:106' \
   "OFPT_HELLO with contradictory version bitmaps" "  " 18
 at_xfail=no
 (
-  $as_echo "139. $at_setup_line: testing $at_desc ..."
+  $as_echo "140. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29422,7 +29450,7 @@
 $as_echo "$at_srcdir/ofp-print.at:109: ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print \"01 00 00 10 00 00 00 00 00 01 00 08 00 00 00 00\""
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-print.at:109"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print "01 00 00 10 00 00 00 00 00 01 00 08 00 00 00 00"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ofp_util|WARN|peer does not support any OpenFlow version (between 0x01 and 0x1f)
@@ -29442,7 +29470,7 @@
 $as_echo "$at_srcdir/ofp-print.at:118: ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print \"3f 00 00 18 00 00 00 00 00 01 00 0c 00 00 00 00 aa aa aa aa 00 00 00 00\""
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-print.at:118"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print "3f 00 00 18 00 00 00 00 00 01 00 0c 00 00 00 00 aa aa aa aa 00 00 00 00"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ofp_util|WARN|peer does not support any OpenFlow version (between 0x01 and 0x1f)
@@ -29463,7 +29491,7 @@
 $as_echo "$at_srcdir/ofp-print.at:128: ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print \"01 00 00 10 00 00 00 00 00 01 00 08 00 00 00 f1\""
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-print.at:128"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print "01 00 00 10 00 00 00 00 00 01 00 08 00 00 00 f1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ofp_util|WARN|peer claims to support invalid OpenFlow version 0x00
@@ -29481,7 +29509,7 @@
 $as_echo "$at_srcdir/ofp-print.at:135: ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print \"01 00 00 10 00 00 00 00 00 01 00 08 00 00 00 01\""
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-print.at:135"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print "01 00 00 10 00 00 00 00 00 01 00 08 00 00 00 01"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ofp_util|WARN|peer claims to support invalid OpenFlow version 0x00
@@ -29502,13 +29530,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_139
-#AT_START_140
-at_fn_group_banner 140 'ofp-print.at:148' \
+#AT_STOP_140
+#AT_START_141
+at_fn_group_banner 141 'ofp-print.at:148' \
   "OFPT_ECHO_REQUEST, empty payload" "               " 18
 at_xfail=no
 (
-  $as_echo "140. $at_setup_line: testing $at_desc ..."
+  $as_echo "141. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29516,7 +29544,7 @@
 $as_echo "$at_srcdir/ofp-print.at:150: ovs-ofctl ofp-print '01 02 00 08 00 00 00 01'"
 at_fn_check_prepare_trace "ofp-print.at:150"
 ( $at_check_trace; ovs-ofctl ofp-print '01 02 00 08 00 00 00 01'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29531,13 +29559,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_140
-#AT_START_141
-at_fn_group_banner 141 'ofp-print.at:155' \
+#AT_STOP_141
+#AT_START_142
+at_fn_group_banner 142 'ofp-print.at:155' \
   "OFPT_ECHO_REQUEST, 5-byte payload" "              " 18
 at_xfail=no
 (
-  $as_echo "141. $at_setup_line: testing $at_desc ..."
+  $as_echo "142. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29545,7 +29573,7 @@
 $as_echo "$at_srcdir/ofp-print.at:157: ovs-ofctl ofp-print '0102000d00000001 25 53 54 1a 9d'"
 at_fn_check_prepare_trace "ofp-print.at:157"
 ( $at_check_trace; ovs-ofctl ofp-print '0102000d00000001 25 53 54 1a 9d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29561,13 +29589,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_141
-#AT_START_142
-at_fn_group_banner 142 'ofp-print.at:163' \
+#AT_STOP_142
+#AT_START_143
+at_fn_group_banner 143 'ofp-print.at:163' \
   "OFPT_ECHO_REPLY, empty payload" "                 " 18
 at_xfail=no
 (
-  $as_echo "142. $at_setup_line: testing $at_desc ..."
+  $as_echo "143. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29575,7 +29603,7 @@
 $as_echo "$at_srcdir/ofp-print.at:165: ovs-ofctl ofp-print '01 03 00 08 00 00 00 01'"
 at_fn_check_prepare_trace "ofp-print.at:165"
 ( $at_check_trace; ovs-ofctl ofp-print '01 03 00 08 00 00 00 01'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29590,13 +29618,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_142
-#AT_START_143
-at_fn_group_banner 143 'ofp-print.at:170' \
+#AT_STOP_143
+#AT_START_144
+at_fn_group_banner 144 'ofp-print.at:170' \
   "OFPT_ECHO_REPLY, 5-byte payload" "                " 18
 at_xfail=no
 (
-  $as_echo "143. $at_setup_line: testing $at_desc ..."
+  $as_echo "144. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29604,7 +29632,7 @@
 $as_echo "$at_srcdir/ofp-print.at:172: ovs-ofctl ofp-print '0103000d0000000ba330efaf9e'"
 at_fn_check_prepare_trace "ofp-print.at:172"
 ( $at_check_trace; ovs-ofctl ofp-print '0103000d0000000ba330efaf9e'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29620,13 +29648,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_143
-#AT_START_144
-at_fn_group_banner 144 'ofp-print.at:178' \
+#AT_STOP_144
+#AT_START_145
+at_fn_group_banner 145 'ofp-print.at:178' \
   "OFPT_FEATURES_REQUEST" "                          " 18
 at_xfail=no
 (
-  $as_echo "144. $at_setup_line: testing $at_desc ..."
+  $as_echo "145. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29634,7 +29662,7 @@
 $as_echo "$at_srcdir/ofp-print.at:180: ovs-ofctl ofp-print '0105000800000001'"
 at_fn_check_prepare_trace "ofp-print.at:180"
 ( $at_check_trace; ovs-ofctl ofp-print '0105000800000001'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29649,13 +29677,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_144
-#AT_START_145
-at_fn_group_banner 145 'ofp-print.at:185' \
+#AT_STOP_145
+#AT_START_146
+at_fn_group_banner 146 'ofp-print.at:185' \
   "OFPT_FEATURES_REPLY - OF1.0" "                    " 18
 at_xfail=no
 (
-  $as_echo "145. $at_setup_line: testing $at_desc ..."
+  $as_echo "146. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29693,7 +29721,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 02 08 00 00 02 8f 00 00 02 8f 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29736,13 +29764,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_145
-#AT_START_146
-at_fn_group_banner 146 'ofp-print.at:235' \
+#AT_STOP_146
+#AT_START_147
+at_fn_group_banner 147 'ofp-print.at:235' \
   "OFPT_FEATURES_REPLY cut off mid-port - OF1.0" "   " 18
 at_xfail=no
 (
-  $as_echo "146. $at_setup_line: testing $at_desc ..."
+  $as_echo "147. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29780,7 +29808,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 02 08 00 00 02 8f 00 00 02 8f \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -29809,7 +29837,7 @@
 $as_echo "$at_srcdir/ofp-print.at:269: sed 's/.*|//' stderr"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-print.at:269"
 ( $at_check_trace; sed 's/.*|//' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29824,13 +29852,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_146
-#AT_START_147
-at_fn_group_banner 147 'ofp-print.at:274' \
+#AT_STOP_147
+#AT_START_148
+at_fn_group_banner 148 'ofp-print.at:274' \
   "OFPT_FEATURES_REPLY - OF1.1" "                    " 18
 at_xfail=no
 (
-  $as_echo "147. $at_setup_line: testing $at_desc ..."
+  $as_echo "148. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29860,7 +29888,7 @@
 00 00 00 00 00 00 00 00 00 00 20 08 00 00 28 0f \
 00 00 28 0f 00 00 00 00 00 01 86 a0 00 01 86 a0 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29888,13 +29916,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_147
-#AT_START_148
-at_fn_group_banner 148 'ofp-print.at:305' \
+#AT_STOP_148
+#AT_START_149
+at_fn_group_banner 149 'ofp-print.at:305' \
   "OFPT_FEATURES_REPLY cut off mid-port - OF1.1" "   " 18
 at_xfail=no
 (
-  $as_echo "148. $at_setup_line: testing $at_desc ..."
+  $as_echo "149. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29922,7 +29950,7 @@
 65 74 68 30 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 20 08 00 00 28 0f \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -29946,7 +29974,7 @@
 $as_echo "$at_srcdir/ofp-print.at:329: sed 's/.*|//' stderr"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-print.at:329"
 ( $at_check_trace; sed 's/.*|//' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -29961,13 +29989,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_148
-#AT_START_149
-at_fn_group_banner 149 'ofp-print.at:334' \
+#AT_STOP_149
+#AT_START_150
+at_fn_group_banner 150 'ofp-print.at:334' \
   "OFPT_FEATURES_REPLY - OF1.2" "                    " 18
 at_xfail=no
 (
-  $as_echo "149. $at_setup_line: testing $at_desc ..."
+  $as_echo "150. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -29997,7 +30025,7 @@
 00 00 00 00 00 00 00 00 00 00 20 08 00 00 28 0f \
 00 00 28 0f 00 00 00 00 00 01 86 a0 00 01 86 a0 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30025,13 +30053,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_149
-#AT_START_150
-at_fn_group_banner 150 'ofp-print.at:365' \
+#AT_STOP_150
+#AT_START_151
+at_fn_group_banner 151 'ofp-print.at:365' \
   "OFPT_FEATURES_REPLY cut off mid-port - OF1.2" "   " 18
 at_xfail=no
 (
-  $as_echo "150. $at_setup_line: testing $at_desc ..."
+  $as_echo "151. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30059,7 +30087,7 @@
 65 74 68 30 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 20 08 00 00 28 0f \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -30084,7 +30112,7 @@
 $as_echo "$at_srcdir/ofp-print.at:390: sed 's/.*|//' stderr"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-print.at:390"
 ( $at_check_trace; sed 's/.*|//' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30097,13 +30125,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_150
-#AT_START_151
-at_fn_group_banner 151 'ofp-print.at:394' \
+#AT_STOP_151
+#AT_START_152
+at_fn_group_banner 152 'ofp-print.at:394' \
   "OFPT_FEATURES_REPLY - OF1.3" "                    " 18
 at_xfail=no
 (
-  $as_echo "151. $at_setup_line: testing $at_desc ..."
+  $as_echo "152. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30117,7 +30145,7 @@
 04 06 00 20 00 00 00 01 00 00 50 54 00 00 00 01 \
 00 00 01 00 ff 00 00 00 00 00 01 77 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30134,13 +30162,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_151
-#AT_START_152
-at_fn_group_banner 152 'ofp-print.at:406' \
+#AT_STOP_152
+#AT_START_153
+at_fn_group_banner 153 'ofp-print.at:406' \
   "OFPT_FEATURES_REPLY - with auxiliary_id - OF1.3" "" 18
 at_xfail=no
 (
-  $as_echo "152. $at_setup_line: testing $at_desc ..."
+  $as_echo "153. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30154,7 +30182,7 @@
 04 06 00 20 00 00 00 01 00 00 50 54 00 00 00 01 \
 00 00 01 00 ff 01 00 00 00 00 01 77 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30171,13 +30199,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_152
-#AT_START_153
-at_fn_group_banner 153 'ofp-print.at:418' \
+#AT_STOP_153
+#AT_START_154
+at_fn_group_banner 154 'ofp-print.at:418' \
   "OFPT_GET_CONFIG_REQUEST" "                        " 18
 at_xfail=no
 (
-  $as_echo "153. $at_setup_line: testing $at_desc ..."
+  $as_echo "154. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30185,7 +30213,7 @@
 $as_echo "$at_srcdir/ofp-print.at:420: ovs-ofctl ofp-print '0107000800000001'"
 at_fn_check_prepare_trace "ofp-print.at:420"
 ( $at_check_trace; ovs-ofctl ofp-print '0107000800000001'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30200,13 +30228,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_153
-#AT_START_154
-at_fn_group_banner 154 'ofp-print.at:425' \
+#AT_STOP_154
+#AT_START_155
+at_fn_group_banner 155 'ofp-print.at:425' \
   "OFPT_GET_CONFIG_REPLY, most common form" "        " 18
 at_xfail=no
 (
-  $as_echo "154. $at_setup_line: testing $at_desc ..."
+  $as_echo "155. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30214,7 +30242,7 @@
 $as_echo "$at_srcdir/ofp-print.at:427: ovs-ofctl ofp-print '01 08 00 0c 00 00 00 03 00 00 00 00'"
 at_fn_check_prepare_trace "ofp-print.at:427"
 ( $at_check_trace; ovs-ofctl ofp-print '01 08 00 0c 00 00 00 03 00 00 00 00'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30229,13 +30257,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_154
-#AT_START_155
-at_fn_group_banner 155 'ofp-print.at:433' \
+#AT_STOP_155
+#AT_START_156
+at_fn_group_banner 156 'ofp-print.at:433' \
   "OFPT_GET_CONFIG_REPLY, frags and miss_send_len" " " 18
 at_xfail=no
 (
-  $as_echo "155. $at_setup_line: testing $at_desc ..."
+  $as_echo "156. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30243,7 +30271,7 @@
 $as_echo "$at_srcdir/ofp-print.at:435: ovs-ofctl ofp-print '01 08 00 0c 00 00 00 03 00 02 00 ff'"
 at_fn_check_prepare_trace "ofp-print.at:435"
 ( $at_check_trace; ovs-ofctl ofp-print '01 08 00 0c 00 00 00 03 00 02 00 ff'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30258,13 +30286,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_155
-#AT_START_156
-at_fn_group_banner 156 'ofp-print.at:440' \
+#AT_STOP_156
+#AT_START_157
+at_fn_group_banner 157 'ofp-print.at:440' \
   "OFPT_PACKET_IN - OF1.0" "                         " 18
 at_xfail=no
 (
-  $as_echo "156. $at_setup_line: testing $at_desc ..."
+  $as_echo "157. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30284,7 +30312,7 @@
 c0 a8 00 02 27 2f 00 00 78 50 cc 5b 57 af 42 1e \
 50 02 02 00 26 e8 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30300,13 +30328,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_156
-#AT_START_157
-at_fn_group_banner 157 'ofp-print.at:454' \
+#AT_STOP_157
+#AT_START_158
+at_fn_group_banner 158 'ofp-print.at:454' \
   "OFPT_PACKET_IN - OF1.0, with hex output of packet data" "" 18
 at_xfail=no
 (
-  $as_echo "157. $at_setup_line: testing $at_desc ..."
+  $as_echo "158. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30326,7 +30354,7 @@
 c0 a8 00 02 27 2f 00 00 78 50 cc 5b 57 af 42 1e \
 50 10 02 00 26 e8 00 00 00 00 00 00 00 00 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30346,13 +30374,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_157
-#AT_START_158
-at_fn_group_banner 158 'ofp-print.at:472' \
+#AT_STOP_158
+#AT_START_159
+at_fn_group_banner 159 'ofp-print.at:472' \
   "OFPT_PACKET_IN - OF1.1" "                         " 18
 at_xfail=no
 (
-  $as_echo "158. $at_setup_line: testing $at_desc ..."
+  $as_echo "159. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30374,7 +30402,7 @@
 c0 a8 00 02 27 2f 00 00 78 50 cc 5b 57 af 42 1e \
 50 02 02 00 26 e8 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30390,13 +30418,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_158
-#AT_START_159
-at_fn_group_banner 159 'ofp-print.at:487' \
+#AT_STOP_159
+#AT_START_160
+at_fn_group_banner 160 'ofp-print.at:487' \
   "OFPT_PACKET_IN - OF1.2" "                         " 18
 at_xfail=no
 (
-  $as_echo "159. $at_setup_line: testing $at_desc ..."
+  $as_echo "160. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30416,7 +30444,7 @@
 00 01 08 00 06 04 00 01 00 23 20 83 c1 5f 00 00 \
 00 00 00 23 20 83 c1 5f 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30432,13 +30460,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_159
-#AT_START_160
-at_fn_group_banner 160 'ofp-print.at:501' \
+#AT_STOP_160
+#AT_START_161
+at_fn_group_banner 161 'ofp-print.at:501' \
   "OFPT_PACKET_IN - OF1.2, with hex output of packet data" "" 18
 at_xfail=no
 (
-  $as_echo "160. $at_setup_line: testing $at_desc ..."
+  $as_echo "161. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30458,7 +30486,7 @@
 00 01 08 00 06 04 00 03 00 23 20 83 c1 5f 00 00 \
 00 00 00 23 20 83 c1 5f 00 00 00 00 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30477,13 +30505,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_160
-#AT_START_161
-at_fn_group_banner 161 'ofp-print.at:518' \
+#AT_STOP_161
+#AT_START_162
+at_fn_group_banner 162 'ofp-print.at:518' \
   "OFPT_PACKET_IN - OF1.3" "                         " 18
 at_xfail=no
 (
-  $as_echo "161. $at_setup_line: testing $at_desc ..."
+  $as_echo "162. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30505,7 +30533,7 @@
 00 23 20 83 c1 5f 00 00 00 00 00 23 20 83 c1 5f \
 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30521,13 +30549,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_161
-#AT_START_162
-at_fn_group_banner 162 'ofp-print.at:533' \
+#AT_STOP_162
+#AT_START_163
+at_fn_group_banner 163 'ofp-print.at:533' \
   "OFPT_PACKET_IN - OF1.4" "                         " 18
 at_xfail=no
 (
-  $as_echo "162. $at_setup_line: testing $at_desc ..."
+  $as_echo "163. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30549,7 +30577,7 @@
 00 23 20 83 c1 5f 00 00 00 00 00 23 20 83 c1 5f \
 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30565,13 +30593,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_162
-#AT_START_163
-at_fn_group_banner 163 'ofp-print.at:548' \
+#AT_STOP_163
+#AT_START_164
+at_fn_group_banner 164 'ofp-print.at:548' \
   "OFPT_PACKET_IN - OF1.5" "                         " 18
 at_xfail=no
 (
-  $as_echo "163. $at_setup_line: testing $at_desc ..."
+  $as_echo "164. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30593,7 +30621,7 @@
 00 23 20 83 c1 5f 00 00 00 00 00 23 20 83 c1 5f \
 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30609,13 +30637,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_163
-#AT_START_164
-at_fn_group_banner 164 'ofp-print.at:563' \
+#AT_STOP_164
+#AT_START_165
+at_fn_group_banner 165 'ofp-print.at:563' \
   "OFPT_PACKET_IN - OF1.3, with hex output of packet data" "" 18
 at_xfail=no
 (
-  $as_echo "164. $at_setup_line: testing $at_desc ..."
+  $as_echo "165. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30637,7 +30665,7 @@
 00 23 20 83 c1 5f 00 00 00 00 00 23 20 83 c1 5f \
 00 00 00 00 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30656,13 +30684,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_164
-#AT_START_165
-at_fn_group_banner 165 'ofp-print.at:581' \
+#AT_STOP_165
+#AT_START_166
+at_fn_group_banner 166 'ofp-print.at:581' \
   "OFPT_FLOW_REMOVED - OF1.0" "                      " 18
 at_xfail=no
 (
-  $as_echo "165. $at_setup_line: testing $at_desc ..."
+  $as_echo "166. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30684,7 +30712,7 @@
 30 e0 35 00 00 05 00 00 00 00 00 00 00 00 00 01 \
 00 00 00 00 00 00 00 3c \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30699,13 +30727,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_165
-#AT_START_166
-at_fn_group_banner 166 'ofp-print.at:595' \
+#AT_STOP_166
+#AT_START_167
+at_fn_group_banner 167 'ofp-print.at:595' \
   "OFPT_FLOW_REMOVED - OF1.2" "                      " 18
 at_xfail=no
 (
-  $as_echo "166. $at_setup_line: testing $at_desc ..."
+  $as_echo "167. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30721,7 +30749,7 @@
 80 00 01 05 00 00 00 01 00 98 96 80 00 3c 00 78 \
 00 00 00 00 00 12 d6 87 00 00 00 00 6f 68 ba 66 \
 00 01 00 0a 80 00 0c 02 10 09 00 00 00 00 00 00"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30736,13 +30764,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_166
-#AT_START_167
-at_fn_group_banner 167 'ofp-print.at:606' \
+#AT_STOP_167
+#AT_START_168
+at_fn_group_banner 168 'ofp-print.at:606' \
   "OFPT_FLOW_REMOVED - OF1.3" "                      " 18
 at_xfail=no
 (
-  $as_echo "167. $at_setup_line: testing $at_desc ..."
+  $as_echo "168. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30758,7 +30786,7 @@
 80 00 01 05 00 00 00 01 00 98 96 80 00 3c 00 78 \
 00 00 00 00 00 12 d6 87 00 00 00 00 6f 68 ba 66 \
 00 01 00 0a 80 00 0c 02 10 09 00 00 00 00 00 00"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30773,13 +30801,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_167
-#AT_START_168
-at_fn_group_banner 168 'ofp-print.at:617' \
+#AT_STOP_168
+#AT_START_169
+at_fn_group_banner 169 'ofp-print.at:617' \
   "OFPT_PORT_STATUS - OF1.0" "                       " 18
 at_xfail=no
 (
-  $as_echo "168. $at_setup_line: testing $at_desc ..."
+  $as_echo "169. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30797,7 +30825,7 @@
 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 01 \
 00 00 02 08 00 00 02 8f 00 00 02 8f 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30818,13 +30846,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_168
-#AT_START_169
-at_fn_group_banner 169 'ofp-print.at:635' \
+#AT_STOP_169
+#AT_START_170
+at_fn_group_banner 170 'ofp-print.at:635' \
   "OFPT_PORT_STATUS - OF1.1" "                       " 18
 at_xfail=no
 (
-  $as_echo "169. $at_setup_line: testing $at_desc ..."
+  $as_echo "170. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30844,7 +30872,7 @@
 00 00 00 00 00 00 00 00 00 00 20 08 00 00 28 0f \
 00 00 28 0f 00 00 00 00 00 01 86 a0 00 01 86 a0 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30865,13 +30893,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_169
-#AT_START_170
-at_fn_group_banner 170 'ofp-print.at:654' \
+#AT_STOP_170
+#AT_START_171
+at_fn_group_banner 171 'ofp-print.at:654' \
   "OFPT_PORT_STATUS - OF1.4" "                       " 18
 at_xfail=no
 (
-  $as_echo "170. $at_setup_line: testing $at_desc ..."
+  $as_echo "171. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30893,7 +30921,7 @@
 00 00 20 08 00 00 28 0f 00 00 28 0f 00 00 00 00 \
 00 01 86 a0 00 01 86 a0 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30914,13 +30942,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_170
-#AT_START_171
-at_fn_group_banner 171 'ofp-print.at:674' \
+#AT_STOP_171
+#AT_START_172
+at_fn_group_banner 172 'ofp-print.at:674' \
   "OFPT_PACKET_OUT - OF1.0" "                        " 18
 at_xfail=no
 (
-  $as_echo "171. $at_setup_line: testing $at_desc ..."
+  $as_echo "172. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30942,7 +30970,7 @@
 00 00 6a 4f 2b 58 50 14 00 00 6d 75 00 00 00 00 \
 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -30957,13 +30985,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_171
-#AT_START_172
-at_fn_group_banner 172 'ofp-print.at:688' \
+#AT_STOP_172
+#AT_START_173
+at_fn_group_banner 173 'ofp-print.at:688' \
   "OFPT_PACKET_OUT - OF1.0, with packet" "           " 18
 at_xfail=no
 (
-  $as_echo "172. $at_setup_line: testing $at_desc ..."
+  $as_echo "173. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -30985,7 +31013,7 @@
 00 00 6a 4f 2b 58 50 14 00 00 6d 75 00 00 00 00 \
 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31001,13 +31029,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_172
-#AT_START_173
-at_fn_group_banner 173 'ofp-print.at:703' \
+#AT_STOP_173
+#AT_START_174
+at_fn_group_banner 174 'ofp-print.at:703' \
   "OFPT_PACKET_OUT - OF1.0, with hex output of packet data" "" 18
 at_xfail=no
 (
-  $as_echo "173. $at_setup_line: testing $at_desc ..."
+  $as_echo "174. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31029,7 +31057,7 @@
 00 00 6a 4f 2b 58 50 14 00 00 6d 75 00 00 00 00 \
 00 00 00 00 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31049,13 +31077,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_173
-#AT_START_174
-at_fn_group_banner 174 'ofp-print.at:722' \
+#AT_STOP_174
+#AT_START_175
+at_fn_group_banner 175 'ofp-print.at:722' \
   "OFPT_PACKET_OUT - OF1.1" "                        " 18
 at_xfail=no
 (
-  $as_echo "174. $at_setup_line: testing $at_desc ..."
+  $as_echo "175. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31071,7 +31099,7 @@
 00 10 00 00 00 00 00 00 00 00 00 10 ff ff ff fb \
 05 dc 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31086,13 +31114,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_174
-#AT_START_175
-at_fn_group_banner 175 'ofp-print.at:733' \
+#AT_STOP_175
+#AT_START_176
+at_fn_group_banner 176 'ofp-print.at:733' \
   "OFPT_PACKET_OUT - OF1.1, with packet" "           " 18
 at_xfail=no
 (
-  $as_echo "175. $at_setup_line: testing $at_desc ..."
+  $as_echo "176. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31116,7 +31144,7 @@
 00 00 6a 4f 2b 58 50 14 00 00 6d 75 00 00 00 00 \
 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31132,13 +31160,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_175
-#AT_START_176
-at_fn_group_banner 176 'ofp-print.at:750' \
+#AT_STOP_176
+#AT_START_177
+at_fn_group_banner 177 'ofp-print.at:750' \
   "OFPT_FLOW_MOD - OF1.0 - low verbosity" "          " 18
 at_xfail=no
 (
-  $as_echo "176. $at_setup_line: testing $at_desc ..."
+  $as_echo "177. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31158,7 +31186,7 @@
 00 00 00 00 00 00 00 00 00 00 00 05 00 00 00 00 \
 00 00 01 0e 00 00 00 00 00 00 00 08 00 03 00 00 \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ofp_util|INFO|normalization changed ofp_match, details:
@@ -31177,13 +31205,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_176
-#AT_START_177
-at_fn_group_banner 177 'ofp-print.at:768' \
+#AT_STOP_177
+#AT_START_178
+at_fn_group_banner 178 'ofp-print.at:768' \
   "OFPT_FLOW_MOD - OF1.1 - low verbosity" "          " 18
 at_xfail=no
 (
-  $as_echo "177. $at_setup_line: testing $at_desc ..."
+  $as_echo "178. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31215,7 +31243,7 @@
 \
 0001 0008 03 000000 \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31230,13 +31258,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_177
-#AT_START_178
-at_fn_group_banner 178 'ofp-print.at:788' \
+#AT_STOP_178
+#AT_START_179
+at_fn_group_banner 179 'ofp-print.at:788' \
   "OFPT_FLOW_MOD - OF1.2 - low verbosity" "          " 18
 at_xfail=no
 (
-  $as_echo "178. $at_setup_line: testing $at_desc ..."
+  $as_echo "179. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31264,7 +31292,7 @@
 00 01 00 00 00 00 00 00 00 04 00 18 00 00 00 00 \
 00 00 00 10 00 00 00 03 00 00 00 00 00 00 00 00 \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31279,13 +31307,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_178
-#AT_START_179
-at_fn_group_banner 179 'ofp-print.at:808' \
+#AT_STOP_179
+#AT_START_180
+at_fn_group_banner 180 'ofp-print.at:808' \
   "OFPT_FLOW_MOD - OF1.0 - high verbosity" "         " 18
 at_xfail=no
 (
-  $as_echo "179. $at_setup_line: testing $at_desc ..."
+  $as_echo "180. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31305,7 +31333,7 @@
 00 00 00 00 00 00 00 00 00 00 00 05 00 00 00 00 \
 00 00 01 0e 00 00 00 00 00 00 00 08 00 03 00 00 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ofp_util|INFO|normalization changed ofp_match, details:
@@ -31324,13 +31352,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_179
-#AT_START_180
-at_fn_group_banner 180 'ofp-print.at:826' \
+#AT_STOP_180
+#AT_START_181
+at_fn_group_banner 181 'ofp-print.at:826' \
   "OFPT_FLOW_MOD - OF1.2 - low verbosity" "          " 18
 at_xfail=no
 (
-  $as_echo "180. $at_setup_line: testing $at_desc ..."
+  $as_echo "181. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31358,7 +31386,7 @@
 00 01 00 00 00 00 00 00 00 04 00 18 00 00 00 00 \
 00 00 00 10 00 00 00 03 00 00 00 00 00 00 00 00 \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31373,13 +31401,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_180
-#AT_START_181
-at_fn_group_banner 181 'ofp-print.at:845' \
+#AT_STOP_181
+#AT_START_182
+at_fn_group_banner 182 'ofp-print.at:845' \
   "OFPT_FLOW_MOD - OF1.3 - flags - low verbosity" "  " 18
 at_xfail=no
 (
-  $as_echo "181. $at_setup_line: testing $at_desc ..."
+  $as_echo "182. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31407,7 +31435,7 @@
 00 01 00 00 00 00 00 00 00 04 00 18 00 00 00 00 \
 00 00 00 10 00 00 00 03 00 00 00 00 00 00 00 00 \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31422,13 +31450,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_181
-#AT_START_182
-at_fn_group_banner 182 'ofp-print.at:863' \
+#AT_STOP_182
+#AT_START_183
+at_fn_group_banner 183 'ofp-print.at:863' \
   "OFPT_FLOW_MOD - OF1.2 - set-field ip_src" "       " 18
 at_xfail=no
 (
-  $as_echo "182. $at_setup_line: testing $at_desc ..."
+  $as_echo "183. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31450,7 +31478,7 @@
 00 04 00 18 00 00 00 00 00 19 00 10 80 00 16 04 \
 c0 a8 03 5c 00 00 00 00                         \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31465,13 +31493,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_182
-#AT_START_183
-at_fn_group_banner 183 'ofp-print.at:878' \
+#AT_STOP_183
+#AT_START_184
+at_fn_group_banner 184 'ofp-print.at:878' \
   "OFPT_FLOW_MOD - OF1.2 - set-field ip_dst" "       " 18
 at_xfail=no
 (
-  $as_echo "183. $at_setup_line: testing $at_desc ..."
+  $as_echo "184. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31493,7 +31521,7 @@
 00 04 00 18 00 00 00 00 00 19 00 10 80 00 18 04 \
 c0 a8 4a 7a 00 00 00 00                         \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31508,13 +31536,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_183
-#AT_START_184
-at_fn_group_banner 184 'ofp-print.at:893' \
+#AT_STOP_184
+#AT_START_185
+at_fn_group_banner 185 'ofp-print.at:893' \
   "OFPT_FLOW_MOD - OF1.2 - set-field sctp_src" "     " 18
 at_xfail=no
 (
-  $as_echo "184. $at_setup_line: testing $at_desc ..."
+  $as_echo "185. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31536,7 +31564,7 @@
 00 04 00 18 00 00 00 00 00 19 00 10 80 00 22 02 \
 0d 06 00 00 00 00 00 00                         \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31551,13 +31579,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_184
-#AT_START_185
-at_fn_group_banner 185 'ofp-print.at:908' \
+#AT_STOP_185
+#AT_START_186
+at_fn_group_banner 186 'ofp-print.at:908' \
   "OFPT_FLOW_MOD - OF1.2 - set-field sctp_dst" "     " 18
 at_xfail=no
 (
-  $as_echo "185. $at_setup_line: testing $at_desc ..."
+  $as_echo "186. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31579,7 +31607,7 @@
 00 04 00 18 00 00 00 00 00 19 00 10 80 00 24 02 \
 11 5d 00 00 00 00 00 00                         \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31594,13 +31622,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_185
-#AT_START_186
-at_fn_group_banner 186 'ofp-print.at:923' \
+#AT_STOP_186
+#AT_START_187
+at_fn_group_banner 187 'ofp-print.at:923' \
   "OFPT_FLOW_MOD - OF1.2 - experimenter OXM" "       " 18
 at_xfail=no
 (
-  $as_echo "186. $at_setup_line: testing $at_desc ..."
+  $as_echo "187. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31620,7 +31648,7 @@
 00 01 00 14 ff ff 01 0c 00 00 23 20 01 23 45 67 \
 0f ff ff ff 00 00 00 00
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31635,13 +31663,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_186
-#AT_START_187
-at_fn_group_banner 187 'ofp-print.at:937' \
+#AT_STOP_187
+#AT_START_188
+at_fn_group_banner 188 'ofp-print.at:937' \
   "OFPT_FLOW_MOD - OF1.2 - set-field nd_target, nd_sll" "" 18
 at_xfail=no
 (
-  $as_echo "187. $at_setup_line: testing $at_desc ..."
+  $as_echo "188. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31667,7 +31695,7 @@
 00 00 00 00 00 00 00 01 00 19 00 10 80 00 40 06 \
 aa aa aa aa aa aa 00 00
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31682,13 +31710,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_187
-#AT_START_188
-at_fn_group_banner 188 'ofp-print.at:955' \
+#AT_STOP_188
+#AT_START_189
+at_fn_group_banner 189 'ofp-print.at:955' \
   "OFPT_FLOW_MOD - OF1.3 - meter" "                  " 18
 at_xfail=no
 (
-  $as_echo "188. $at_setup_line: testing $at_desc ..."
+  $as_echo "189. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31704,7 +31732,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 e8 \
 ff ff ff ff ff ff ff ff ff ff ff ff 00 00 00 00 \
 00 01 00 04 00 00 00 00 00 06 00 08 00 00 00 01"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31719,13 +31747,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_188
-#AT_START_189
-at_fn_group_banner 189 'ofp-print.at:966' \
+#AT_STOP_189
+#AT_START_190
+at_fn_group_banner 190 'ofp-print.at:966' \
   "OFPT_FLOW reply - OF1.2 - set-field ip_src" "     " 18
 at_xfail=no
 (
-  $as_echo "189. $at_setup_line: testing $at_desc ..."
+  $as_echo "190. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31749,7 +31777,7 @@
 00 04 00 18 00 00 00 00 00 19 00 10 80 00 16 04 \
 c0 a8 03 5c 00 00 00 00                         \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31765,13 +31793,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_189
-#AT_START_190
-at_fn_group_banner 190 'ofp-print.at:983' \
+#AT_STOP_190
+#AT_START_191
+at_fn_group_banner 191 'ofp-print.at:983' \
   "OFPT_FLOW reply - OF1.2 - set-field ip_dst" "     " 18
 at_xfail=no
 (
-  $as_echo "190. $at_setup_line: testing $at_desc ..."
+  $as_echo "191. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31795,7 +31823,7 @@
 00 04 00 18 00 00 00 00 00 19 00 10 80 00 18 04 \
 c0 a8 4a 7a 00 00 00 00                         \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31811,13 +31839,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_190
-#AT_START_191
-at_fn_group_banner 191 'ofp-print.at:1000' \
+#AT_STOP_191
+#AT_START_192
+at_fn_group_banner 192 'ofp-print.at:1000' \
   "OFPT_FLOW reply - OF1.2 - set-field sctp_src" "   " 18
 at_xfail=no
 (
-  $as_echo "191. $at_setup_line: testing $at_desc ..."
+  $as_echo "192. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31841,7 +31869,7 @@
 00 04 00 18 00 00 00 00 00 19 00 10 80 00 22 02 \
 0d 06 00 00 00 00 00 00                         \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31857,13 +31885,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_191
-#AT_START_192
-at_fn_group_banner 192 'ofp-print.at:1017' \
+#AT_STOP_192
+#AT_START_193
+at_fn_group_banner 193 'ofp-print.at:1017' \
   "OFPT_FLOW reply - OF1.2 - set-field sctp_dst" "   " 18
 at_xfail=no
 (
-  $as_echo "192. $at_setup_line: testing $at_desc ..."
+  $as_echo "193. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31887,7 +31915,7 @@
 00 04 00 18 00 00 00 00 00 19 00 10 80 00 24 02 \
 11 5d 00 00 00 00 00 00                         \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31903,13 +31931,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_192
-#AT_START_193
-at_fn_group_banner 193 'ofp-print.at:1034' \
+#AT_STOP_193
+#AT_START_194
+at_fn_group_banner 194 'ofp-print.at:1034' \
   "OFPT_PORT_MOD - OF1.0" "                          " 18
 at_xfail=no
 (
-  $as_echo "193. $at_setup_line: testing $at_desc ..."
+  $as_echo "194. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31923,7 +31951,7 @@
 01 0f 00 20 00 00 00 03 00 03 50 54 00 00 00 01 \
 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 00 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31941,13 +31969,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_193
-#AT_START_194
-at_fn_group_banner 194 'ofp-print.at:1047' \
+#AT_STOP_194
+#AT_START_195
+at_fn_group_banner 195 'ofp-print.at:1047' \
   "OFPT_PORT_MOD - OF1.1" "                          " 18
 at_xfail=no
 (
-  $as_echo "194. $at_setup_line: testing $at_desc ..."
+  $as_echo "195. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -31963,7 +31991,7 @@
 50 54 00 00 00 01 00 00 00 00 00 01 00 00 00 01 \
 00 00 00 00 00 00 00 00 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -31981,13 +32009,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_194
-#AT_START_195
-at_fn_group_banner 195 'ofp-print.at:1061' \
+#AT_STOP_195
+#AT_START_196
+at_fn_group_banner 196 'ofp-print.at:1061' \
   "OFPT_PORT_MOD - OF1.2" "                          " 18
 at_xfail=no
 (
-  $as_echo "195. $at_setup_line: testing $at_desc ..."
+  $as_echo "196. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32003,7 +32031,7 @@
 50 54 00 00 00 01 00 00 00 00 00 01 00 00 00 01 \
 00 00 00 00 00 00 00 00 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32021,13 +32049,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_195
-#AT_START_196
-at_fn_group_banner 196 'ofp-print.at:1075' \
+#AT_STOP_196
+#AT_START_197
+at_fn_group_banner 197 'ofp-print.at:1075' \
   "OFPT_PORT_MOD - OF1.3" "                          " 18
 at_xfail=no
 (
-  $as_echo "196. $at_setup_line: testing $at_desc ..."
+  $as_echo "197. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32043,7 +32071,7 @@
 50 54 00 00 00 01 00 00 00 00 00 01 00 00 00 01 \
 00 00 00 00 00 00 00 00 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32061,13 +32089,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_196
-#AT_START_197
-at_fn_group_banner 197 'ofp-print.at:1089' \
+#AT_STOP_197
+#AT_START_198
+at_fn_group_banner 198 'ofp-print.at:1089' \
   "OFPT_PORT_MOD - OF1.4" "                          " 18
 at_xfail=no
 (
-  $as_echo "197. $at_setup_line: testing $at_desc ..."
+  $as_echo "198. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32083,7 +32111,7 @@
 50 54 00 00 00 01 00 00 00 00 00 01 00 00 00 01 \
 00 00 00 08 00 00 00 01
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32101,13 +32129,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_197
-#AT_START_198
-at_fn_group_banner 198 'ofp-print.at:1103' \
+#AT_STOP_198
+#AT_START_199
+at_fn_group_banner 199 'ofp-print.at:1103' \
   "OFPT_TABLE_MOD - OF1.1" "                         " 18
 at_xfail=no
 (
-  $as_echo "198. $at_setup_line: testing $at_desc ..."
+  $as_echo "199. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32119,7 +32147,7 @@
 ( $at_check_trace; ovs-ofctl ofp-print "\
 02 11 00 10 00 00 00 02 02 00 00 00 00 00 00 02 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32134,13 +32162,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_198
-#AT_START_199
-at_fn_group_banner 199 'ofp-print.at:1112' \
+#AT_STOP_199
+#AT_START_200
+at_fn_group_banner 200 'ofp-print.at:1112' \
   "OFPT_TABLE_MOD - OF1.2" "                         " 18
 at_xfail=no
 (
-  $as_echo "199. $at_setup_line: testing $at_desc ..."
+  $as_echo "200. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32152,7 +32180,7 @@
 ( $at_check_trace; ovs-ofctl ofp-print "\
 03 11 00 10 00 00 00 02 02 00 00 00 00 00 00 01 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32167,13 +32195,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_199
-#AT_START_200
-at_fn_group_banner 200 'ofp-print.at:1121' \
+#AT_STOP_200
+#AT_START_201
+at_fn_group_banner 201 'ofp-print.at:1121' \
   "OFPT_TABLE_MOD - OF1.3" "                         " 18
 at_xfail=no
 (
-  $as_echo "200. $at_setup_line: testing $at_desc ..."
+  $as_echo "201. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32185,7 +32213,7 @@
 ( $at_check_trace; ovs-ofctl ofp-print "\
 04 11 00 10 00 00 00 02 02 00 00 00 00 00 00 00 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32200,13 +32228,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_200
-#AT_START_201
-at_fn_group_banner 201 'ofp-print.at:1130' \
+#AT_STOP_201
+#AT_START_202
+at_fn_group_banner 202 'ofp-print.at:1130' \
   "OFPT_TABLE_MOD - OF1.4" "                         " 18
 at_xfail=no
 (
-  $as_echo "201. $at_setup_line: testing $at_desc ..."
+  $as_echo "202. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32218,7 +32246,7 @@
 ( $at_check_trace; ovs-ofctl ofp-print "\
 05 11 00 10 00 00 00 02 02 00 00 00 00 00 00 00 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32233,13 +32261,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_201
-#AT_START_202
-at_fn_group_banner 202 'ofp-print.at:1139' \
+#AT_STOP_202
+#AT_START_203
+at_fn_group_banner 203 'ofp-print.at:1139' \
   "OFPST_DESC request" "                             " 18
 at_xfail=no
 (
-  $as_echo "202. $at_setup_line: testing $at_desc ..."
+  $as_echo "203. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32247,7 +32275,7 @@
 $as_echo "$at_srcdir/ofp-print.at:1141: ovs-ofctl ofp-print \"0110000c0000000100000000\""
 at_fn_check_prepare_trace "ofp-print.at:1141"
 ( $at_check_trace; ovs-ofctl ofp-print "0110000c0000000100000000"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32262,13 +32290,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_202
-#AT_START_203
-at_fn_group_banner 203 'ofp-print.at:1146' \
+#AT_STOP_203
+#AT_START_204
+at_fn_group_banner 204 'ofp-print.at:1146' \
   "OFPST_DESC reply" "                               " 18
 at_xfail=no
 (
-  $as_echo "203. $at_setup_line: testing $at_desc ..."
+  $as_echo "204. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32412,7 +32440,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32432,13 +32460,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_203
-#AT_START_204
-at_fn_group_banner 204 'ofp-print.at:1226' \
+#AT_STOP_204
+#AT_START_205
+at_fn_group_banner 205 'ofp-print.at:1226' \
   "OFPST_FLOW request - OF1.0" "                     " 18
 at_xfail=no
 (
-  $as_echo "204. $at_setup_line: testing $at_desc ..."
+  $as_echo "205. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32456,7 +32484,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 ff 00 ff ff \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32471,13 +32499,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_204
-#AT_START_205
-at_fn_group_banner 205 'ofp-print.at:1238' \
+#AT_STOP_205
+#AT_START_206
+at_fn_group_banner 206 'ofp-print.at:1238' \
   "OFPST_FLOW request - OF1.2" "                     " 18
 at_xfail=no
 (
-  $as_echo "205. $at_setup_line: testing $at_desc ..."
+  $as_echo "206. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32495,7 +32523,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 01 00 04 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32510,13 +32538,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_205
-#AT_START_206
-at_fn_group_banner 206 'ofp-print.at:1250' \
+#AT_STOP_206
+#AT_START_207
+at_fn_group_banner 207 'ofp-print.at:1250' \
   "OFPST_FLOW request - OF1.3" "                     " 18
 at_xfail=no
 (
-  $as_echo "206. $at_setup_line: testing $at_desc ..."
+  $as_echo "207. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32534,7 +32562,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 01 00 04 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32549,13 +32577,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_206
-#AT_START_207
-at_fn_group_banner 207 'ofp-print.at:1262' \
+#AT_STOP_207
+#AT_START_208
+at_fn_group_banner 208 'ofp-print.at:1262' \
   "OFPST_FLOW reply - OF1.0" "                       " 18
 at_xfail=no
 (
-  $as_echo "207. $at_setup_line: testing $at_desc ..."
+  $as_echo "208. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32627,7 +32655,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32647,13 +32675,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_207
-#AT_START_208
-at_fn_group_banner 208 'ofp-print.at:1306' \
+#AT_STOP_208
+#AT_START_209
+at_fn_group_banner 209 'ofp-print.at:1306' \
   "OFPST_FLOW reply - OF1.2" "                       " 18
 at_xfail=no
 (
-  $as_echo "208. $at_setup_line: testing $at_desc ..."
+  $as_echo "209. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32711,7 +32739,7 @@
 00 04 00 18 00 00 00 00 00 00 00 10 00 00 00 02 \
 05 dc 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32729,13 +32757,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_208
-#AT_START_209
-at_fn_group_banner 209 'ofp-print.at:1341' \
+#AT_STOP_209
+#AT_START_210
+at_fn_group_banner 210 'ofp-print.at:1341' \
   "OFPST_AGGREGATE request - OF1.0" "                " 18
 at_xfail=no
 (
-  $as_echo "209. $at_setup_line: testing $at_desc ..."
+  $as_echo "210. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32753,7 +32781,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 ff 00 ff ff \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32768,13 +32796,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_209
-#AT_START_210
-at_fn_group_banner 210 'ofp-print.at:1353' \
+#AT_STOP_210
+#AT_START_211
+at_fn_group_banner 211 'ofp-print.at:1353' \
   "OFPST_AGGREGATE request - OF1.2" "                " 18
 at_xfail=no
 (
-  $as_echo "210. $at_setup_line: testing $at_desc ..."
+  $as_echo "211. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32792,7 +32820,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 01 00 04 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32807,13 +32835,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_210
-#AT_START_211
-at_fn_group_banner 211 'ofp-print.at:1365' \
+#AT_STOP_211
+#AT_START_212
+at_fn_group_banner 212 'ofp-print.at:1365' \
   "OFPST_AGGREGATE request - OF1.3" "                " 18
 at_xfail=no
 (
-  $as_echo "211. $at_setup_line: testing $at_desc ..."
+  $as_echo "212. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32831,7 +32859,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 01 00 04 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32846,13 +32874,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_211
-#AT_START_212
-at_fn_group_banner 212 'ofp-print.at:1377' \
+#AT_STOP_212
+#AT_START_213
+at_fn_group_banner 213 'ofp-print.at:1377' \
   "OFPST_AGGREGATE reply - OF1.0" "                  " 18
 at_xfail=no
 (
-  $as_echo "212. $at_setup_line: testing $at_desc ..."
+  $as_echo "213. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32868,7 +32896,7 @@
 00 00 01 82 00 00 00 00 00 00 93 78 00 00 00 04 \
 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32883,13 +32911,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_212
-#AT_START_213
-at_fn_group_banner 213 'ofp-print.at:1388' \
+#AT_STOP_213
+#AT_START_214
+at_fn_group_banner 214 'ofp-print.at:1388' \
   "OFPST_AGGREGATE reply - OF1.2" "                  " 18
 at_xfail=no
 (
-  $as_echo "213. $at_setup_line: testing $at_desc ..."
+  $as_echo "214. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32905,7 +32933,7 @@
 00 00 00 00 00 00 00 79 00 00 00 00 00 00 4b 4f \
 00 00 00 03 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32920,13 +32948,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_213
-#AT_START_214
-at_fn_group_banner 214 'ofp-print.at:1399' \
+#AT_STOP_214
+#AT_START_215
+at_fn_group_banner 215 'ofp-print.at:1399' \
   "OFPST_AGGREGATE reply - OF1.3" "                  " 18
 at_xfail=no
 (
-  $as_echo "214. $at_setup_line: testing $at_desc ..."
+  $as_echo "215. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32942,7 +32970,7 @@
 00 00 00 00 00 00 00 79 00 00 00 00 00 00 4b 4f \
 00 00 00 03 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32957,13 +32985,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_214
-#AT_START_215
-at_fn_group_banner 215 'ofp-print.at:1410' \
+#AT_STOP_215
+#AT_START_216
+at_fn_group_banner 216 'ofp-print.at:1410' \
   "OFPST_TABLE request - OF1.0" "                    " 18
 at_xfail=no
 (
-  $as_echo "215. $at_setup_line: testing $at_desc ..."
+  $as_echo "216. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -32971,7 +32999,7 @@
 $as_echo "$at_srcdir/ofp-print.at:1412: ovs-ofctl ofp-print \"0110000c0000000100030000\""
 at_fn_check_prepare_trace "ofp-print.at:1412"
 ( $at_check_trace; ovs-ofctl ofp-print "0110000c0000000100030000"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -32986,13 +33014,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_215
-#AT_START_216
-at_fn_group_banner 216 'ofp-print.at:1417' \
+#AT_STOP_216
+#AT_START_217
+at_fn_group_banner 217 'ofp-print.at:1417' \
   "OFPST_TABLE request - OF1.1" "                    " 18
 at_xfail=no
 (
-  $as_echo "216. $at_setup_line: testing $at_desc ..."
+  $as_echo "217. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33000,7 +33028,7 @@
 $as_echo "$at_srcdir/ofp-print.at:1419: ovs-ofctl ofp-print \"02120010000000020003000000000000\""
 at_fn_check_prepare_trace "ofp-print.at:1419"
 ( $at_check_trace; ovs-ofctl ofp-print "02120010000000020003000000000000"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33015,13 +33043,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_216
-#AT_START_217
-at_fn_group_banner 217 'ofp-print.at:1424' \
+#AT_STOP_217
+#AT_START_218
+at_fn_group_banner 218 'ofp-print.at:1424' \
   "OFPST_TABLE request - OF1.2" "                    " 18
 at_xfail=no
 (
-  $as_echo "217. $at_setup_line: testing $at_desc ..."
+  $as_echo "218. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33029,7 +33057,7 @@
 $as_echo "$at_srcdir/ofp-print.at:1426: ovs-ofctl ofp-print \"03120010000000020003000000000000\""
 at_fn_check_prepare_trace "ofp-print.at:1426"
 ( $at_check_trace; ovs-ofctl ofp-print "03120010000000020003000000000000"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33044,13 +33072,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_217
-#AT_START_218
-at_fn_group_banner 218 'ofp-print.at:1431' \
+#AT_STOP_218
+#AT_START_219
+at_fn_group_banner 219 'ofp-print.at:1431' \
   "OFPST_TABLE request - OF1.3" "                    " 18
 at_xfail=no
 (
-  $as_echo "218. $at_setup_line: testing $at_desc ..."
+  $as_echo "219. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33058,7 +33086,7 @@
 $as_echo "$at_srcdir/ofp-print.at:1433: ovs-ofctl ofp-print \"04120010000000020003000000000000\""
 at_fn_check_prepare_trace "ofp-print.at:1433"
 ( $at_check_trace; ovs-ofctl ofp-print "04120010000000020003000000000000"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33073,13 +33101,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_218
-#AT_START_219
-at_fn_group_banner 219 'ofp-print.at:1438' \
+#AT_STOP_219
+#AT_START_220
+at_fn_group_banner 220 'ofp-print.at:1438' \
   "OFPST_TABLE reply - OF1.0" "                      " 18
 at_xfail=no
 (
-  $as_echo "219. $at_setup_line: testing $at_desc ..."
+  $as_echo "220. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33099,7 +33127,7 @@
 00 3f ff ff 00 10 00 00 00 00 00 0b 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33130,13 +33158,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_219
-#AT_START_220
-at_fn_group_banner 220 'ofp-print.at:1467' \
+#AT_STOP_220
+#AT_START_221
+at_fn_group_banner 221 'ofp-print.at:1467' \
   "OFPST_TABLE reply - OF1.2" "                      " 18
 at_xfail=no
 (
-  $as_echo "220. $at_setup_line: testing $at_desc ..."
+  $as_echo "221. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33231,7 +33259,7 @@
 $as_echo "$at_srcdir/ofp-print.at:1556: ovs-ofctl ofp-print - < in"
 at_fn_check_prepare_trace "ofp-print.at:1556"
 ( $at_check_trace; ovs-ofctl ofp-print - < in
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33244,13 +33272,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_220
-#AT_START_221
-at_fn_group_banner 221 'ofp-print.at:1559' \
+#AT_STOP_221
+#AT_START_222
+at_fn_group_banner 222 'ofp-print.at:1559' \
   "OFPST_TABLE reply - OF1.3" "                      " 18
 at_xfail=no
 (
-  $as_echo "221. $at_setup_line: testing $at_desc ..."
+  $as_echo "222. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33268,7 +33296,7 @@
 00 00 00 00 00 00 01 00 01 00 00 00 00 00 00 0c \
 00 00 00 00 00 00 02 01 00 00 00 00 00 00 01 01 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33288,13 +33316,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_221
-#AT_START_222
-at_fn_group_banner 222 'ofp-print.at:1576' \
+#AT_STOP_222
+#AT_START_223
+at_fn_group_banner 223 'ofp-print.at:1576' \
   "OFPST_PORT request - 1.0" "                       " 18
 at_xfail=no
 (
-  $as_echo "222. $at_setup_line: testing $at_desc ..."
+  $as_echo "223. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33308,7 +33336,7 @@
 01 10 00 14 00 00 00 01 00 04 00 00 ff ff 00 00 \
 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33323,13 +33351,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_222
-#AT_START_223
-at_fn_group_banner 223 'ofp-print.at:1586' \
+#AT_STOP_223
+#AT_START_224
+at_fn_group_banner 224 'ofp-print.at:1586' \
   "OFPST_PORT request - 1.1" "                       " 18
 at_xfail=no
 (
-  $as_echo "223. $at_setup_line: testing $at_desc ..."
+  $as_echo "224. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33343,7 +33371,7 @@
 02 12 00 18 00 00 00 02 00 04 00 00 00 00 00 00 \
 ff ff ff ff 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33358,13 +33386,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_223
-#AT_START_224
-at_fn_group_banner 224 'ofp-print.at:1596' \
+#AT_STOP_224
+#AT_START_225
+at_fn_group_banner 225 'ofp-print.at:1596' \
   "OFPST_PORT request - 1.2" "                       " 18
 at_xfail=no
 (
-  $as_echo "224. $at_setup_line: testing $at_desc ..."
+  $as_echo "225. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33378,7 +33406,7 @@
 03 12 00 18 00 00 00 02 00 04 00 00 00 00 00 00 \
 ff ff ff ff 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33393,13 +33421,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_224
-#AT_START_225
-at_fn_group_banner 225 'ofp-print.at:1606' \
+#AT_STOP_225
+#AT_START_226
+at_fn_group_banner 226 'ofp-print.at:1606' \
   "OFPST_PORT request - 1.3" "                       " 18
 at_xfail=no
 (
-  $as_echo "225. $at_setup_line: testing $at_desc ..."
+  $as_echo "226. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33413,7 +33441,7 @@
 04 12 00 18 00 00 00 02 00 04 00 00 00 00 00 00 \
 ff ff ff ff 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33428,13 +33456,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_225
-#AT_START_226
-at_fn_group_banner 226 'ofp-print.at:1616' \
+#AT_STOP_226
+#AT_START_227
+at_fn_group_banner 227 'ofp-print.at:1616' \
   "OFPST_PORT reply - OF1.0" "                       " 18
 at_xfail=no
 (
-  $as_echo "226. $at_setup_line: testing $at_desc ..."
+  $as_echo "227. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33498,7 +33526,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33521,13 +33549,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_226
-#AT_START_227
-at_fn_group_banner 227 'ofp-print.at:1659' \
+#AT_STOP_227
+#AT_START_228
+at_fn_group_banner 228 'ofp-print.at:1659' \
   "OFPST_PORT reply - OF1.2" "                       " 18
 at_xfail=no
 (
-  $as_echo "227. $at_setup_line: testing $at_desc ..."
+  $as_echo "228. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33579,7 +33607,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33600,13 +33628,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_227
-#AT_START_228
-at_fn_group_banner 228 'ofp-print.at:1694' \
+#AT_STOP_228
+#AT_START_229
+at_fn_group_banner 229 'ofp-print.at:1694' \
   "OFPST_PORT reply - OF1.3" "                       " 18
 at_xfail=no
 (
-  $as_echo "228. $at_setup_line: testing $at_desc ..."
+  $as_echo "229. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33662,7 +33690,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 00 07 54 d4 c0 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33685,13 +33713,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_228
-#AT_START_229
-at_fn_group_banner 229 'ofp-print.at:1733' \
+#AT_STOP_229
+#AT_START_230
+at_fn_group_banner 230 'ofp-print.at:1733' \
   "OFPST_PORT reply - OF1.4" "                       " 18
 at_xfail=no
 (
-  $as_echo "229. $at_setup_line: testing $at_desc ..."
+  $as_echo "230. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33719,7 +33747,7 @@
 00 00 00 00 00 00 00 fd 00 00 00 00 00 00 00 fe \
 00 00 00 00 00 00 00 ff \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33737,13 +33765,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_229
-#AT_START_230
-at_fn_group_banner 230 'ofp-print.at:1753' \
+#AT_STOP_230
+#AT_START_231
+at_fn_group_banner 231 'ofp-print.at:1753' \
   "OFPST_QUEUE request - OF1.0" "                    " 18
 at_xfail=no
 (
-  $as_echo "230. $at_setup_line: testing $at_desc ..."
+  $as_echo "231. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33757,7 +33785,7 @@
 01 10 00 14 00 00 00 01 00 05 00 00 ff fc 00 00 \
 ff ff ff ff \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33772,13 +33800,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_230
-#AT_START_231
-at_fn_group_banner 231 'ofp-print.at:1763' \
+#AT_STOP_231
+#AT_START_232
+at_fn_group_banner 232 'ofp-print.at:1763' \
   "OFPST_QUEUE request - OF1.1" "                    " 18
 at_xfail=no
 (
-  $as_echo "231. $at_setup_line: testing $at_desc ..."
+  $as_echo "232. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33792,7 +33820,7 @@
 02 12 00 18 00 00 00 02 00 05 00 00 00 00 00 00 \
 ff ff ff ff ff ff ff ff \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33807,13 +33835,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_231
-#AT_START_232
-at_fn_group_banner 232 'ofp-print.at:1773' \
+#AT_STOP_232
+#AT_START_233
+at_fn_group_banner 233 'ofp-print.at:1773' \
   "OFPST_QUEUE request - OF1.2" "                    " 18
 at_xfail=no
 (
-  $as_echo "232. $at_setup_line: testing $at_desc ..."
+  $as_echo "233. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33827,7 +33855,7 @@
 03 12 00 18 00 00 00 02 00 05 00 00 00 00 00 00 \
 ff ff ff ff ff ff ff ff \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33842,13 +33870,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_232
-#AT_START_233
-at_fn_group_banner 233 'ofp-print.at:1783' \
+#AT_STOP_233
+#AT_START_234
+at_fn_group_banner 234 'ofp-print.at:1783' \
   "OFPST_QUEUE request - OF1.3" "                    " 18
 at_xfail=no
 (
-  $as_echo "233. $at_setup_line: testing $at_desc ..."
+  $as_echo "234. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33862,7 +33890,7 @@
 04 12 00 18 00 00 00 02 00 05 00 00 00 00 00 00 \
 ff ff ff ff ff ff ff ff \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33877,13 +33905,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_233
-#AT_START_234
-at_fn_group_banner 234 'ofp-print.at:1793' \
+#AT_STOP_234
+#AT_START_235
+at_fn_group_banner 235 'ofp-print.at:1793' \
   "OFPST_QUEUE reply - OF1.0" "                      " 18
 at_xfail=no
 (
-  $as_echo "234. $at_setup_line: testing $at_desc ..."
+  $as_echo "235. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33919,7 +33947,7 @@
 00 00 00 02 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -33940,13 +33968,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_234
-#AT_START_235
-at_fn_group_banner 235 'ofp-print.at:1820' \
+#AT_STOP_235
+#AT_START_236
+at_fn_group_banner 236 'ofp-print.at:1820' \
   "OFPST_QUEUE reply - OF1.1" "                      " 18
 at_xfail=no
 (
-  $as_echo "235. $at_setup_line: testing $at_desc ..."
+  $as_echo "236. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -33982,7 +34010,7 @@
 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34003,13 +34031,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_235
-#AT_START_236
-at_fn_group_banner 236 'ofp-print.at:1847' \
+#AT_STOP_236
+#AT_START_237
+at_fn_group_banner 237 'ofp-print.at:1847' \
   "OFPST_QUEUE reply - OF1.2" "                      " 18
 at_xfail=no
 (
-  $as_echo "236. $at_setup_line: testing $at_desc ..."
+  $as_echo "237. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34045,7 +34073,7 @@
 00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34066,13 +34094,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_236
-#AT_START_237
-at_fn_group_banner 237 'ofp-print.at:1874' \
+#AT_STOP_237
+#AT_START_238
+at_fn_group_banner 238 'ofp-print.at:1874' \
   "OFPST_QUEUE reply - OF1.3" "                      " 18
 at_xfail=no
 (
-  $as_echo "237. $at_setup_line: testing $at_desc ..."
+  $as_echo "238. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34120,7 +34148,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 ff ff ff ff ff ff ff ff \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34141,13 +34169,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_237
-#AT_START_238
-at_fn_group_banner 238 'ofp-print.at:1907' \
+#AT_STOP_238
+#AT_START_239
+at_fn_group_banner 239 'ofp-print.at:1907' \
   "OFPST_QUEUE reply - OF1.4" "                      " 18
 at_xfail=no
 (
-  $as_echo "238. $at_setup_line: testing $at_desc ..."
+  $as_echo "239. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34197,7 +34225,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 ff ff ff ff ff ff ff ff \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34218,13 +34246,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_238
-#AT_START_239
-at_fn_group_banner 239 'ofp-print.at:1941' \
+#AT_STOP_239
+#AT_START_240
+at_fn_group_banner 240 'ofp-print.at:1941' \
   "OFPST_GROUP request" "                            " 18
 at_xfail=no
 (
-  $as_echo "239. $at_setup_line: testing $at_desc ..."
+  $as_echo "240. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34238,7 +34266,7 @@
 02 12 00 18 00 00 00 02 00 06 00 00 00 00 00 00 \
 ff ff ff ff 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34253,13 +34281,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_239
-#AT_START_240
-at_fn_group_banner 240 'ofp-print.at:1950' \
+#AT_STOP_240
+#AT_START_241
+at_fn_group_banner 241 'ofp-print.at:1950' \
   "OFPST_GROUP reply - OF1.1" "                      " 18
 at_xfail=no
 (
-  $as_echo "240. $at_setup_line: testing $at_desc ..."
+  $as_echo "241. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34289,7 +34317,7 @@
 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \
 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34306,13 +34334,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_240
-#AT_START_241
-at_fn_group_banner 241 'ofp-print.at:1970' \
+#AT_STOP_241
+#AT_START_242
+at_fn_group_banner 242 'ofp-print.at:1970' \
   "OFPST_GROUP reply - OF1.3" "                      " 18
 at_xfail=no
 (
-  $as_echo "241. $at_setup_line: testing $at_desc ..."
+  $as_echo "242. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34346,7 +34374,7 @@
 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \
 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34363,13 +34391,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_241
-#AT_START_242
-at_fn_group_banner 242 'ofp-print.at:1992' \
+#AT_STOP_242
+#AT_START_243
+at_fn_group_banner 243 'ofp-print.at:1992' \
   "OFPST_GROUP_DESC request - OF1.1" "               " 18
 at_xfail=no
 (
-  $as_echo "242. $at_setup_line: testing $at_desc ..."
+  $as_echo "243. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34381,7 +34409,7 @@
 ( $at_check_trace; ovs-ofctl ofp-print "\
 02 12 00 10 00 00 00 02 00 07 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34396,13 +34424,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_242
-#AT_START_243
-at_fn_group_banner 243 'ofp-print.at:2000' \
+#AT_STOP_243
+#AT_START_244
+at_fn_group_banner 244 'ofp-print.at:2000' \
   "OFPST_GROUP_DESC request - OF1.5" "               " 18
 at_xfail=no
 (
-  $as_echo "243. $at_setup_line: testing $at_desc ..."
+  $as_echo "244. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34416,7 +34444,7 @@
 06 12 00 14 00 00 00 02 00 07 00 00 00 00 00 00 \
 00 00 00 01
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34431,13 +34459,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_243
-#AT_START_244
-at_fn_group_banner 244 'ofp-print.at:2009' \
+#AT_STOP_244
+#AT_START_245
+at_fn_group_banner 245 'ofp-print.at:2009' \
   "OFPST_GROUP_DESC reply - OF1.1" "                 " 18
 at_xfail=no
 (
-  $as_echo "244. $at_setup_line: testing $at_desc ..."
+  $as_echo "245. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34463,7 +34491,7 @@
 00 20 00 c8 00 00 00 03 ff ff ff ff 00 00 00 00 \
 00 00 00 10 00 00 00 03 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34479,20 +34507,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_244
-#AT_START_245
-at_fn_group_banner 245 'ofp-print.at:2026' \
+#AT_STOP_245
+#AT_START_246
+at_fn_group_banner 246 'ofp-print.at:2026' \
   "OFPST_GROUP_DESC reply - OF1.5" "                 " 18
 at_xfail=no
 (
-  $as_echo "245. $at_setup_line: testing $at_desc ..."
+  $as_echo "246. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
 { set +x
 $as_echo "$at_srcdir/ofp-print.at:2028: ovs-ofctl ofp-print \"\\
 06 13 00 d8 00 00 00 02 00 07 00 00 00 00 00 00 \\
-00 88 01 00 00 00 20 00 00 78 00 00 00 00 00 00 \\
+00 c8 01 00 00 00 20 00 00 78 00 00 00 00 00 00 \\
 00 28 00 10 00 00 00 00 00 00 00 10 00 00 00 01 \\
 00 00 00 00 00 00 00 00 00 00 00 08 00 64 00 00 \\
 00 01 00 08 00 00 00 01 \\
@@ -34511,7 +34539,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ofp-print.at:2028"
 ( $at_check_trace; ovs-ofctl ofp-print "\
 06 13 00 d8 00 00 00 02 00 07 00 00 00 00 00 00 \
-00 88 01 00 00 00 20 00 00 78 00 00 00 00 00 00 \
+00 c8 01 00 00 00 20 00 00 78 00 00 00 00 00 00 \
 00 28 00 10 00 00 00 00 00 00 00 10 00 00 00 01 \
 00 00 00 00 00 00 00 00 00 00 00 08 00 64 00 00 \
 00 01 00 08 00 00 00 01 \
@@ -34527,12 +34555,12 @@
 80 00 18 04 ff ff ff 00 80 00 1a 02 ff ff 80 00 \
 14 01 ff 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_GROUP_DESC reply (OF1.5) (xid=0x2):
- group_id=8192,type=select,selection_method=hash,fields=ip_dst=255.255.255.0,nw_proto,tcp_src,bucket=bucket_id:0,weight:100,watch_port:1,actions=output:1,bucket=bucket_id:1,weight:200,watch_port:2,actions=output:2,bucket=bucket_id:2,weight:200,watch_port:3,actions=output:3
+ group_id=8192,type=select,selection_method=hash,fields(ip_dst=255.255.255.0,nw_proto,tcp_src),bucket=bucket_id:0,weight:100,watch_port:1,actions=output:1,bucket=bucket_id:1,weight:200,watch_port:2,actions=output:2,bucket=bucket_id:2,weight:200,watch_port:3,actions=output:3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
 at_fn_check_status 0 $at_status "$at_srcdir/ofp-print.at:2028"
@@ -34543,13 +34571,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_245
-#AT_START_246
-at_fn_group_banner 246 'ofp-print.at:2051' \
+#AT_STOP_246
+#AT_START_247
+at_fn_group_banner 247 'ofp-print.at:2051' \
   "OFPST_GROUP_FEATURES request" "                   " 18
 at_xfail=no
 (
-  $as_echo "246. $at_setup_line: testing $at_desc ..."
+  $as_echo "247. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34561,7 +34589,7 @@
 ( $at_check_trace; ovs-ofctl ofp-print "\
 03 12 00 10 00 00 00 02 00 08 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34576,13 +34604,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_246
-#AT_START_247
-at_fn_group_banner 247 'ofp-print.at:2059' \
+#AT_STOP_247
+#AT_START_248
+at_fn_group_banner 248 'ofp-print.at:2059' \
   "OFPST_GROUP_FEATURES reply" "                     " 18
 at_xfail=no
 (
-  $as_echo "247. $at_setup_line: testing $at_desc ..."
+  $as_echo "248. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34600,7 +34628,7 @@
 00 00 00 01 00 00 00 02 00 00 00 03 00 00 00 04 \
 00 00 00 01 00 02 00 01 00 06 00 01 00 0e 00 01 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34630,13 +34658,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_247
-#AT_START_248
-at_fn_group_banner 248 'ofp-print.at:2086' \
+#AT_STOP_248
+#AT_START_249
+at_fn_group_banner 249 'ofp-print.at:2086' \
   "OFPST_PORT_DESC request - OF1.0" "                " 18
 at_xfail=no
 (
-  $as_echo "248. $at_setup_line: testing $at_desc ..."
+  $as_echo "249. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34644,7 +34672,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2088: ovs-ofctl ofp-print \"0110000c00000001000d0000\""
 at_fn_check_prepare_trace "ofp-print.at:2088"
 ( $at_check_trace; ovs-ofctl ofp-print "0110000c00000001000d0000"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34659,13 +34687,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_248
-#AT_START_249
-at_fn_group_banner 249 'ofp-print.at:2093' \
+#AT_STOP_249
+#AT_START_250
+at_fn_group_banner 250 'ofp-print.at:2093' \
   "OFPST_PORT_DESC request - OF1.5" "                " 18
 at_xfail=no
 (
-  $as_echo "249. $at_setup_line: testing $at_desc ..."
+  $as_echo "250. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34677,7 +34705,7 @@
 ( $at_check_trace; ovs-ofctl ofp-print "\
 06 12 00 14 00 00 00 02 00 0d 00 00 00 00 00 00 \
 00 00 00 05"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34692,13 +34720,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_249
-#AT_START_250
-at_fn_group_banner 250 'ofp-print.at:2102' \
+#AT_STOP_250
+#AT_START_251
+at_fn_group_banner 251 'ofp-print.at:2102' \
   "OFPST_PORT_DESC reply - OF1.0" "                  " 18
 at_xfail=no
 (
-  $as_echo "250. $at_setup_line: testing $at_desc ..."
+  $as_echo "251. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34716,7 +34744,7 @@
 00 00 00 00 00 00 00 01 00 00 00 01 00 00 02 08 \
 00 00 02 8f 00 00 02 8f 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34738,13 +34766,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_250
-#AT_START_251
-at_fn_group_banner 251 'ofp-print.at:2121' \
+#AT_STOP_251
+#AT_START_252
+at_fn_group_banner 252 'ofp-print.at:2121' \
   "OFPST_PORT_DESC reply - OF1.4" "                  " 18
 at_xfail=no
 (
-  $as_echo "251. $at_setup_line: testing $at_desc ..."
+  $as_echo "252. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34766,7 +34794,7 @@
 00 00 20 08 00 00 28 0f 00 00 28 0f 00 00 00 00 \
 00 01 86 a0 00 01 86 a0 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34788,13 +34816,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_251
-#AT_START_252
-at_fn_group_banner 252 'ofp-print.at:2142' \
+#AT_STOP_252
+#AT_START_253
+at_fn_group_banner 253 'ofp-print.at:2142' \
   "OFPT_METER_MOD request - OF1.3" "                 " 18
 at_xfail=no
 (
-  $as_echo "252. $at_setup_line: testing $at_desc ..."
+  $as_echo "253. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34808,7 +34836,7 @@
 04 1d 00 20 00 00 00 02 00 00 00 0d 00 00 00 05 \
 00 01 00 10 00 00 04 00 00 00 00 80 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34824,13 +34852,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_252
-#AT_START_253
-at_fn_group_banner 253 'ofp-print.at:2153' \
+#AT_STOP_253
+#AT_START_254
+at_fn_group_banner 254 'ofp-print.at:2153' \
   "OFPT_METER_MOD request - bad band - OF1.3" "      " 18
 at_xfail=no
 (
-  $as_echo "253. $at_setup_line: testing $at_desc ..."
+  $as_echo "254. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34844,7 +34872,7 @@
 04 1d 00 20 85 01 d7 38 00 00 00 00 00 00 00 01
 00 05 00 10 00 00 00 02 00 00 00 02 00 00 00 00
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34859,13 +34887,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_253
-#AT_START_254
-at_fn_group_banner 254 'ofp-print.at:2163' \
+#AT_STOP_254
+#AT_START_255
+at_fn_group_banner 255 'ofp-print.at:2163' \
   "OFPT_METER_MOD request - bad command - OF1.3" "   " 18
 at_xfail=no
 (
-  $as_echo "254. $at_setup_line: testing $at_desc ..."
+  $as_echo "255. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34877,7 +34905,7 @@
 ( $at_check_trace; ovs-ofctl ofp-print "\
 04 1d 00 10 28 a6 26 52 00 08 00 00 00 00 00 01
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34892,13 +34920,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_254
-#AT_START_255
-at_fn_group_banner 255 'ofp-print.at:2172' \
+#AT_STOP_255
+#AT_START_256
+at_fn_group_banner 256 'ofp-print.at:2172' \
   "OFPT_METER_MOD request - bad flags - OF1.3" "     " 18
 at_xfail=no
 (
-  $as_echo "255. $at_setup_line: testing $at_desc ..."
+  $as_echo "256. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34912,7 +34940,7 @@
 04 1d 00 20 82 b3 a1 a4 00 00 00 03 00 00 00 01 \
 00 01 00 10 00 00 00 02 00 00 00 02 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34927,13 +34955,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_255
-#AT_START_256
-at_fn_group_banner 256 'ofp-print.at:2182' \
+#AT_STOP_256
+#AT_START_257
+at_fn_group_banner 257 'ofp-print.at:2182' \
   "OFPST_METER request - OF1.3" "                    " 18
 at_xfail=no
 (
-  $as_echo "256. $at_setup_line: testing $at_desc ..."
+  $as_echo "257. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34941,7 +34969,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2184: ovs-ofctl ofp-print \"041200180000000200090000000000000000000100000000\""
 at_fn_check_prepare_trace "ofp-print.at:2184"
 ( $at_check_trace; ovs-ofctl ofp-print "041200180000000200090000000000000000000100000000"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34956,13 +34984,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_256
-#AT_START_257
-at_fn_group_banner 257 'ofp-print.at:2189' \
+#AT_STOP_257
+#AT_START_258
+at_fn_group_banner 258 'ofp-print.at:2189' \
   "OFPST_METER_CONFIG request - OF1.3" "             " 18
 at_xfail=no
 (
-  $as_echo "257. $at_setup_line: testing $at_desc ..."
+  $as_echo "258. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34970,7 +34998,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2191: ovs-ofctl ofp-print \"0412001800000002000a0000000000000000000100000000\""
 at_fn_check_prepare_trace "ofp-print.at:2191"
 ( $at_check_trace; ovs-ofctl ofp-print "0412001800000002000a0000000000000000000100000000"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -34985,13 +35013,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_257
-#AT_START_258
-at_fn_group_banner 258 'ofp-print.at:2196' \
+#AT_STOP_258
+#AT_START_259
+at_fn_group_banner 259 'ofp-print.at:2196' \
   "OFPST_METER_FEATURES request - OF1.3" "           " 18
 at_xfail=no
 (
-  $as_echo "258. $at_setup_line: testing $at_desc ..."
+  $as_echo "259. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -34999,7 +35027,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2198: ovs-ofctl ofp-print \"0412001000000002000b000000000000\""
 at_fn_check_prepare_trace "ofp-print.at:2198"
 ( $at_check_trace; ovs-ofctl ofp-print "0412001000000002000b000000000000"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35014,13 +35042,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_258
-#AT_START_259
-at_fn_group_banner 259 'ofp-print.at:2203' \
+#AT_STOP_259
+#AT_START_260
+at_fn_group_banner 260 'ofp-print.at:2203' \
   "OFPST_METER_FEATURES reply - OF1.3" "             " 18
 at_xfail=no
 (
-  $as_echo "259. $at_setup_line: testing $at_desc ..."
+  $as_echo "260. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35034,7 +35062,7 @@
 04 13 00 20 00 00 00 02 00 0b 00 00 00 00 00 00 \
 00 01 00 00 00 00 00 06 00 00 00 0F 10 02 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35052,13 +35080,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_259
-#AT_START_260
-at_fn_group_banner 260 'ofp-print.at:2216' \
+#AT_STOP_260
+#AT_START_261
+at_fn_group_banner 261 'ofp-print.at:2216' \
   "OFPST_METER_CONFIG reply - OF1.3" "               " 18
 at_xfail=no
 (
-  $as_echo "260. $at_setup_line: testing $at_desc ..."
+  $as_echo "261. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35080,7 +35108,7 @@
 00 18 00 09 00 00 00 02 \
 00 01 00 10 00 02 00 00 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35101,13 +35129,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_260
-#AT_START_261
-at_fn_group_banner 261 'ofp-print.at:2236' \
+#AT_STOP_261
+#AT_START_262
+at_fn_group_banner 262 'ofp-print.at:2236' \
   "OFPST_METER reply - OF1.3" "                      " 18
 at_xfail=no
 (
-  $as_echo "261. $at_setup_line: testing $at_desc ..."
+  $as_echo "262. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35137,7 +35165,7 @@
 00 00 01 87 0a 23 6e 44 \
 00 00 00 00 00 00 00 2a 00 00 00 00 00 00 04 33 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35158,13 +35186,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_261
-#AT_START_262
-at_fn_group_banner 262 'ofp-print.at:2260' \
+#AT_STOP_262
+#AT_START_263
+at_fn_group_banner 263 'ofp-print.at:2260' \
   "OFPST_TABLE_FEATURES request - OF1.3" "           " 18
 at_xfail=no
 (
-  $as_echo "262. $at_setup_line: testing $at_desc ..."
+  $as_echo "263. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35470,7 +35498,7 @@
 80 00 30 06 80 00 32 06 80 00 1a 02 80 00 1c 02 \
 80 00 1e 02 80 00 20 02 80 00 22 02 80 00 24 02 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35549,13 +35577,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_262
-#AT_START_263
-at_fn_group_banner 263 'ofp-print.at:2479' \
+#AT_STOP_263
+#AT_START_264
+at_fn_group_banner 264 'ofp-print.at:2479' \
   "OFPT_BARRIER_REQUEST - OF1.0" "                   " 18
 at_xfail=no
 (
-  $as_echo "263. $at_setup_line: testing $at_desc ..."
+  $as_echo "264. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35563,7 +35591,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2481: ovs-ofctl ofp-print '01 12 00 08 00 00 00 01'"
 at_fn_check_prepare_trace "ofp-print.at:2481"
 ( $at_check_trace; ovs-ofctl ofp-print '01 12 00 08 00 00 00 01'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35578,13 +35606,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_263
-#AT_START_264
-at_fn_group_banner 264 'ofp-print.at:2486' \
+#AT_STOP_264
+#AT_START_265
+at_fn_group_banner 265 'ofp-print.at:2486' \
   "OFPT_BARRIER_REQUEST - OF1.1" "                   " 18
 at_xfail=no
 (
-  $as_echo "264. $at_setup_line: testing $at_desc ..."
+  $as_echo "265. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35592,7 +35620,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2488: ovs-ofctl ofp-print '02 14 00 08 00 00 00 01'"
 at_fn_check_prepare_trace "ofp-print.at:2488"
 ( $at_check_trace; ovs-ofctl ofp-print '02 14 00 08 00 00 00 01'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35607,13 +35635,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_264
-#AT_START_265
-at_fn_group_banner 265 'ofp-print.at:2493' \
+#AT_STOP_265
+#AT_START_266
+at_fn_group_banner 266 'ofp-print.at:2493' \
   "OFPT_BARRIER_REQUEST - OF1.2" "                   " 18
 at_xfail=no
 (
-  $as_echo "265. $at_setup_line: testing $at_desc ..."
+  $as_echo "266. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35621,7 +35649,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2495: ovs-ofctl ofp-print '03 14 00 08 00 00 00 01'"
 at_fn_check_prepare_trace "ofp-print.at:2495"
 ( $at_check_trace; ovs-ofctl ofp-print '03 14 00 08 00 00 00 01'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35636,13 +35664,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_265
-#AT_START_266
-at_fn_group_banner 266 'ofp-print.at:2500' \
+#AT_STOP_266
+#AT_START_267
+at_fn_group_banner 267 'ofp-print.at:2500' \
   "OFPT_BARRIER_REQUEST - OF1.3" "                   " 18
 at_xfail=no
 (
-  $as_echo "266. $at_setup_line: testing $at_desc ..."
+  $as_echo "267. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35650,7 +35678,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2502: ovs-ofctl ofp-print '04 14 00 08 00 00 00 01'"
 at_fn_check_prepare_trace "ofp-print.at:2502"
 ( $at_check_trace; ovs-ofctl ofp-print '04 14 00 08 00 00 00 01'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35665,13 +35693,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_266
-#AT_START_267
-at_fn_group_banner 267 'ofp-print.at:2507' \
+#AT_STOP_267
+#AT_START_268
+at_fn_group_banner 268 'ofp-print.at:2507' \
   "OFPT_BARRIER_REPLY - OF1.0" "                     " 18
 at_xfail=no
 (
-  $as_echo "267. $at_setup_line: testing $at_desc ..."
+  $as_echo "268. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35679,7 +35707,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2509: ovs-ofctl ofp-print '01 13 00 08 00 00 00 01'"
 at_fn_check_prepare_trace "ofp-print.at:2509"
 ( $at_check_trace; ovs-ofctl ofp-print '01 13 00 08 00 00 00 01'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35694,13 +35722,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_267
-#AT_START_268
-at_fn_group_banner 268 'ofp-print.at:2514' \
+#AT_STOP_268
+#AT_START_269
+at_fn_group_banner 269 'ofp-print.at:2514' \
   "OFPT_BARRIER_REPLY - OF1.1" "                     " 18
 at_xfail=no
 (
-  $as_echo "268. $at_setup_line: testing $at_desc ..."
+  $as_echo "269. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35708,7 +35736,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2516: ovs-ofctl ofp-print '02 15 00 08 00 00 00 01'"
 at_fn_check_prepare_trace "ofp-print.at:2516"
 ( $at_check_trace; ovs-ofctl ofp-print '02 15 00 08 00 00 00 01'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35723,13 +35751,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_268
-#AT_START_269
-at_fn_group_banner 269 'ofp-print.at:2521' \
+#AT_STOP_269
+#AT_START_270
+at_fn_group_banner 270 'ofp-print.at:2521' \
   "OFPT_BARRIER_REPLY - OF1.2" "                     " 18
 at_xfail=no
 (
-  $as_echo "269. $at_setup_line: testing $at_desc ..."
+  $as_echo "270. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35737,7 +35765,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2523: ovs-ofctl ofp-print '03 15 00 08 00 00 00 01'"
 at_fn_check_prepare_trace "ofp-print.at:2523"
 ( $at_check_trace; ovs-ofctl ofp-print '03 15 00 08 00 00 00 01'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35752,13 +35780,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_269
-#AT_START_270
-at_fn_group_banner 270 'ofp-print.at:2528' \
+#AT_STOP_270
+#AT_START_271
+at_fn_group_banner 271 'ofp-print.at:2528' \
   "OFPT_BARRIER_REPLY - OF1.3" "                     " 18
 at_xfail=no
 (
-  $as_echo "270. $at_setup_line: testing $at_desc ..."
+  $as_echo "271. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35766,7 +35794,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2530: ovs-ofctl ofp-print '04 15 00 08 00 00 00 01'"
 at_fn_check_prepare_trace "ofp-print.at:2530"
 ( $at_check_trace; ovs-ofctl ofp-print '04 15 00 08 00 00 00 01'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35781,13 +35809,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_270
-#AT_START_271
-at_fn_group_banner 271 'ofp-print.at:2535' \
+#AT_STOP_271
+#AT_START_272
+at_fn_group_banner 272 'ofp-print.at:2535' \
   "OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.0" "          " 18
 at_xfail=no
 (
-  $as_echo "271. $at_setup_line: testing $at_desc ..."
+  $as_echo "272. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35795,7 +35823,7 @@
 $as_echo "$at_srcdir/ofp-print.at:2537: ovs-ofctl ofp-print \"01 14 00 0c 00 00 00 01 00 01 00 00\""
 at_fn_check_prepare_trace "ofp-print.at:2537"
 ( $at_check_trace; ovs-ofctl ofp-print "01 14 00 0c 00 00 00 01 00 01 00 00"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35810,13 +35838,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_271
-#AT_START_272
-at_fn_group_banner 272 'ofp-print.at:2542' \
+#AT_STOP_272
+#AT_START_273
+at_fn_group_banner 273 'ofp-print.at:2542' \
   "OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.2" "          " 18
 at_xfail=no
 (
-  $as_echo "272. $at_setup_line: testing $at_desc ..."
+  $as_echo "273. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35826,7 +35854,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ofp-print.at:2544"
 ( $at_check_trace; ovs-ofctl ofp-print "\
 03 16 00 10 00 00 00 01 00 00 00 01 00 00 00 00"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35841,13 +35869,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_272
-#AT_START_273
-at_fn_group_banner 273 'ofp-print.at:2550' \
+#AT_STOP_273
+#AT_START_274
+at_fn_group_banner 274 'ofp-print.at:2550' \
   "OFPT_QUEUE_GET_CONFIG_REPLY - OF1.0" "            " 18
 at_xfail=no
 (
-  $as_echo "273. $at_setup_line: testing $at_desc ..."
+  $as_echo "274. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35867,7 +35895,7 @@
 00 02 00 10 00 00 00 00 02 ee 00 00 00 00 00 00 \
 00 00 44 44 00 08 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35884,13 +35912,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_273
-#AT_START_274
-at_fn_group_banner 274 'ofp-print.at:2565' \
+#AT_STOP_274
+#AT_START_275
+at_fn_group_banner 275 'ofp-print.at:2565' \
   "OFPT_QUEUE_GET_CONFIG_REPLY - OF1.2" "            " 18
 at_xfail=no
 (
-  $as_echo "274. $at_setup_line: testing $at_desc ..."
+  $as_echo "275. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35910,7 +35938,7 @@
 00 02 00 10 00 00 00 00 02 ee 00 00 00 00 00 00 \
 00 00 44 44 00 08 00 01 00 10 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35927,13 +35955,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_274
-#AT_START_275
-at_fn_group_banner 275 'ofp-print.at:2580' \
+#AT_STOP_275
+#AT_START_276
+at_fn_group_banner 276 'ofp-print.at:2580' \
   "OFPT_SET_ASYNC - OF1.3" "                         " 18
 at_xfail=no
 (
-  $as_echo "275. $at_setup_line: testing $at_desc ..."
+  $as_echo "276. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35947,7 +35975,7 @@
 04 1c 00 20 00 00 00 00 00 00 10 05 00 00 10 07 \
 00 00 00 03 00 00 00 07 00 00 00 00 00 00 00 03 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -35971,13 +35999,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_275
-#AT_START_276
-at_fn_group_banner 276 'ofp-print.at:2599' \
+#AT_STOP_276
+#AT_START_277
+at_fn_group_banner 277 'ofp-print.at:2599' \
   "OFPT_ROLE_REQUEST - OF1.2" "                      " 18
 at_xfail=no
 (
-  $as_echo "276. $at_setup_line: testing $at_desc ..."
+  $as_echo "277. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -35991,7 +36019,7 @@
 03 18 00 18 00 00 00 02 00 00 00 02 00 00 00 00 \
 00 00 00 00 00 00 00 03 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36006,13 +36034,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_276
-#AT_START_277
-at_fn_group_banner 277 'ofp-print.at:2609' \
+#AT_STOP_277
+#AT_START_278
+at_fn_group_banner 278 'ofp-print.at:2609' \
   "OFPT_ROLE_REQUEST - nochange - OF1.2" "           " 18
 at_xfail=no
 (
-  $as_echo "277. $at_setup_line: testing $at_desc ..."
+  $as_echo "278. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36026,7 +36054,7 @@
 03 18 00 18 00 00 00 02 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36041,13 +36069,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_277
-#AT_START_278
-at_fn_group_banner 278 'ofp-print.at:2619' \
+#AT_STOP_278
+#AT_START_279
+at_fn_group_banner 279 'ofp-print.at:2619' \
   "NXT_ROLE_REQUEST" "                               " 18
 at_xfail=no
 (
-  $as_echo "278. $at_setup_line: testing $at_desc ..."
+  $as_echo "279. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36061,7 +36089,7 @@
 01 04 00 14 00 00 00 02 00 00 23 20 00 00 00 0a \
 00 00 00 01 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36076,13 +36104,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_278
-#AT_START_279
-at_fn_group_banner 279 'ofp-print.at:2629' \
+#AT_STOP_279
+#AT_START_280
+at_fn_group_banner 280 'ofp-print.at:2629' \
   "OFPT_ROLE_REPLY - OF1.2" "                        " 18
 at_xfail=no
 (
-  $as_echo "279. $at_setup_line: testing $at_desc ..."
+  $as_echo "280. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36096,7 +36124,7 @@
 03 19 00 18 00 00 00 02 00 00 00 03 00 00 00 00 \
 12 34 56 78 ab cd ef 90 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36111,13 +36139,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_279
-#AT_START_280
-at_fn_group_banner 280 'ofp-print.at:2639' \
+#AT_STOP_280
+#AT_START_281
+at_fn_group_banner 281 'ofp-print.at:2639' \
   "NXT_ROLE_REPLY" "                                 " 18
 at_xfail=no
 (
-  $as_echo "280. $at_setup_line: testing $at_desc ..."
+  $as_echo "281. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36131,7 +36159,7 @@
 01 04 00 14 00 00 00 02 00 00 23 20 00 00 00 0b \
 00 00 00 02 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36146,13 +36174,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_280
-#AT_START_281
-at_fn_group_banner 281 'ofp-print.at:2649' \
+#AT_STOP_281
+#AT_START_282
+at_fn_group_banner 282 'ofp-print.at:2649' \
   "OFP_ROLE_STATUS - master, experimenter - OF1.4" " " 18
 at_xfail=no
 (
-  $as_echo "281. $at_setup_line: testing $at_desc ..."
+  $as_echo "282. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36166,7 +36194,7 @@
 05 1e 00 18 00 00 00 0a \
 00 00 00 02 02 00 00 00 ff ff ff ff ff ff ff ff \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36181,13 +36209,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_281
-#AT_START_282
-at_fn_group_banner 282 'ofp-print.at:2659' \
+#AT_STOP_282
+#AT_START_283
+at_fn_group_banner 283 'ofp-print.at:2659' \
   "OFP_ROLE_STATUS - master, config - OF1.4" "       " 18
 at_xfail=no
 (
-  $as_echo "282. $at_setup_line: testing $at_desc ..."
+  $as_echo "283. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36201,7 +36229,7 @@
 05 1e 00 18 00 00 00 0a \
 00 00 00 02 01 00 00 00 ff ff ff ff ff ff ff ff \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36216,13 +36244,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_282
-#AT_START_283
-at_fn_group_banner 283 'ofp-print.at:2669' \
+#AT_STOP_283
+#AT_START_284
+at_fn_group_banner 284 'ofp-print.at:2669' \
   "OFP_ROLE_STATUS - master, config,generation - OF1.4" "" 18
 at_xfail=no
 (
-  $as_echo "283. $at_setup_line: testing $at_desc ..."
+  $as_echo "284. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36236,7 +36264,7 @@
 05 1e 00 18 00 00 00 0a \
 00 00 00 02 01 00 00 00 00 00 00 00 00 00 00 10 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36251,13 +36279,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_283
-#AT_START_284
-at_fn_group_banner 284 'ofp-print.at:2679' \
+#AT_STOP_284
+#AT_START_285
+at_fn_group_banner 285 'ofp-print.at:2679' \
   "NXT_SET_PACKET_IN" "                              " 18
 at_xfail=no
 (
-  $as_echo "284. $at_setup_line: testing $at_desc ..."
+  $as_echo "285. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36271,7 +36299,7 @@
 01 04 00 14 00 00 00 02 00 00 23 20 00 00 00 10 \
 00 00 00 01 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36286,13 +36314,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_284
-#AT_START_285
-at_fn_group_banner 285 'ofp-print.at:2689' \
+#AT_STOP_285
+#AT_START_286
+at_fn_group_banner 286 'ofp-print.at:2689' \
   "NXT_PACKET_IN" "                                  " 18
 at_xfail=no
 (
-  $as_echo "285. $at_setup_line: testing $at_desc ..."
+  $as_echo "286. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36326,7 +36354,7 @@
 00 55 00 56 00 00 00 00 00 00 00 00 50 02 00 00 \
 31 6d 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36342,13 +36370,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_285
-#AT_START_286
-at_fn_group_banner 286 'ofp-print.at:2710' \
+#AT_STOP_286
+#AT_START_287
+at_fn_group_banner 287 'ofp-print.at:2710' \
   "NXT_PACKET_IN, with hex output of packet data" "  " 18
 at_xfail=no
 (
-  $as_echo "286. $at_setup_line: testing $at_desc ..."
+  $as_echo "287. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36382,7 +36410,7 @@
 00 55 00 56 00 00 00 00 00 00 00 00 50 01 00 00 \
 31 6d 00 00 00 00 00 00 00 00 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36402,13 +36430,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_286
-#AT_START_287
-at_fn_group_banner 287 'ofp-print.at:2735' \
+#AT_STOP_287
+#AT_START_288
+at_fn_group_banner 288 'ofp-print.at:2735' \
   "NXT_SET_ASYNC_CONFIG" "                           " 18
 at_xfail=no
 (
-  $as_echo "287. $at_setup_line: testing $at_desc ..."
+  $as_echo "288. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36424,7 +36452,7 @@
 00 00 10 05 00 00 10 07 00 00 00 03 00 00 00 07 \
 00 00 00 00 00 00 00 03 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36448,13 +36476,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_287
-#AT_START_288
-at_fn_group_banner 288 'ofp-print.at:2755' \
+#AT_STOP_288
+#AT_START_289
+at_fn_group_banner 289 'ofp-print.at:2755' \
   "NXT_SET_CONTROLLER_ID" "                          " 18
 at_xfail=no
 (
-  $as_echo "288. $at_setup_line: testing $at_desc ..."
+  $as_echo "289. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36468,7 +36496,7 @@
 01 04 00 18 00 00 00 03 00 00 23 20 00 00 00 14 \
 00 00 00 00 00 00 00 7b \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36483,13 +36511,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_288
-#AT_START_289
-at_fn_group_banner 289 'ofp-print.at:2765' \
+#AT_STOP_289
+#AT_START_290
+at_fn_group_banner 290 'ofp-print.at:2765' \
   "NXT_FLOW_MONITOR_CANCEL" "                        " 18
 at_xfail=no
 (
-  $as_echo "289. $at_setup_line: testing $at_desc ..."
+  $as_echo "290. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36503,7 +36531,7 @@
 01 04 00 14 00 00 00 03 00 00 23 20 00 00 00 15 \
 01 02 30 40 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36518,13 +36546,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_289
-#AT_START_290
-at_fn_group_banner 290 'ofp-print.at:2775' \
+#AT_STOP_290
+#AT_START_291
+at_fn_group_banner 291 'ofp-print.at:2775' \
   "NXT_FLOW_MONITOR_PAUSED" "                        " 18
 at_xfail=no
 (
-  $as_echo "290. $at_setup_line: testing $at_desc ..."
+  $as_echo "291. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36536,7 +36564,7 @@
 ( $at_check_trace; ovs-ofctl ofp-print "\
 01 04 00 10 00 00 00 03 00 00 23 20 00 00 00 16 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36551,13 +36579,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_290
-#AT_START_291
-at_fn_group_banner 291 'ofp-print.at:2784' \
+#AT_STOP_291
+#AT_START_292
+at_fn_group_banner 292 'ofp-print.at:2784' \
   "NXT_FLOW_MONITOR_RESUMED" "                       " 18
 at_xfail=no
 (
-  $as_echo "291. $at_setup_line: testing $at_desc ..."
+  $as_echo "292. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36569,7 +36597,7 @@
 ( $at_check_trace; ovs-ofctl ofp-print "\
 01 04 00 10 00 00 00 03 00 00 23 20 00 00 00 17 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36584,13 +36612,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_291
-#AT_START_292
-at_fn_group_banner 292 'ofp-print.at:2793' \
+#AT_STOP_292
+#AT_START_293
+at_fn_group_banner 293 'ofp-print.at:2793' \
   "NXT_SET_FLOW_FORMAT" "                            " 18
 at_xfail=no
 (
-  $as_echo "292. $at_setup_line: testing $at_desc ..."
+  $as_echo "293. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36604,7 +36632,7 @@
 01 04 00 14 00 00 00 02 00 00 23 20 00 00 00 0c \
 00 00 00 02 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36619,13 +36647,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_292
-#AT_START_293
-at_fn_group_banner 293 'ofp-print.at:2804' \
+#AT_STOP_293
+#AT_START_294
+at_fn_group_banner 294 'ofp-print.at:2804' \
   "NXT_FLOW_MOD, low verbosity" "                    " 18
 at_xfail=no
 (
-  $as_echo "293. $at_setup_line: testing $at_desc ..."
+  $as_echo "294. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36647,7 +36675,7 @@
 00 00 00 7b 00 00 00 00 ff ff 00 18 00 00 23 20 \
 00 07 00 1f 00 01 00 04 00 00 00 00 00 00 00 05 \
 " 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36662,13 +36690,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_293
-#AT_START_294
-at_fn_group_banner 294 'ofp-print.at:2820' \
+#AT_STOP_294
+#AT_START_295
+at_fn_group_banner 295 'ofp-print.at:2820' \
   "NXT_FLOW_MOD, high verbosity" "                   " 18
 at_xfail=no
 (
-  $as_echo "294. $at_setup_line: testing $at_desc ..."
+  $as_echo "295. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36690,7 +36718,7 @@
 00 00 00 7b 00 00 00 00 ff ff 00 18 00 00 23 20 \
 00 07 00 1f 00 01 00 04 00 00 00 00 00 00 00 05 \
 " 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36705,13 +36733,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_294
-#AT_START_295
-at_fn_group_banner 295 'ofp-print.at:2834' \
+#AT_STOP_295
+#AT_START_296
+at_fn_group_banner 296 'ofp-print.at:2834' \
   "OFPT_GROUP_MOD - OF1.1" "                         " 18
 at_xfail=no
 (
-  $as_echo "295. $at_setup_line: testing $at_desc ..."
+  $as_echo "296. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36735,7 +36763,7 @@
 00 20 00 c8 00 00 00 03 ff ff ff ff 00 00 00 00 \
 00 00 00 10 00 00 00 03 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36751,13 +36779,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_295
-#AT_START_296
-at_fn_group_banner 296 'ofp-print.at:2850' \
+#AT_STOP_296
+#AT_START_297
+at_fn_group_banner 297 'ofp-print.at:2850' \
   "OFPT_GROUP_MOD add - OF1.5" "                     " 18
 at_xfail=no
 (
-  $as_echo "296. $at_setup_line: testing $at_desc ..."
+  $as_echo "297. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36791,7 +36819,7 @@
 68 61 73 68 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 07 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36807,13 +36835,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_296
-#AT_START_297
-at_fn_group_banner 297 'ofp-print.at:2871' \
+#AT_STOP_297
+#AT_START_298
+at_fn_group_banner 298 'ofp-print.at:2871' \
   "OFPT_GROUP_MOD insert bucket - OF1.5" "           " 18
 at_xfail=no
 (
-  $as_echo "297. $at_setup_line: testing $at_desc ..."
+  $as_echo "298. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36841,7 +36869,7 @@
 00 00 00 10 00 00 00 03 00 00 00 00 00 00 00 00 \
 00 00 00 08 00 c8 00 00 00 01 00 08 00 00 00 03 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36857,13 +36885,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_297
-#AT_START_298
-at_fn_group_banner 298 'ofp-print.at:2889' \
+#AT_STOP_298
+#AT_START_299
+at_fn_group_banner 299 'ofp-print.at:2889' \
   "NXT_FLOW_REMOVED" "                               " 18
 at_xfail=no
 (
-  $as_echo "298. $at_setup_line: testing $at_desc ..."
+  $as_echo "299. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36889,7 +36917,7 @@
 1e 02 00 02 00 00 20 04 c0 a8 00 01 00 00 22 04 \
 c0 a8 00 02 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36904,13 +36932,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_298
-#AT_START_299
-at_fn_group_banner 299 'ofp-print.at:2905' \
+#AT_STOP_299
+#AT_START_300
+at_fn_group_banner 300 'ofp-print.at:2905' \
   "NXT_FLOW_MOD_TABLE_ID" "                          " 18
 at_xfail=no
 (
-  $as_echo "299. $at_setup_line: testing $at_desc ..."
+  $as_echo "300. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36924,7 +36952,7 @@
 01 04 00 18 01 02 03 04 00 00 23 20 00 00 00 0f \
 01 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36939,13 +36967,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_299
-#AT_START_300
-at_fn_group_banner 300 'ofp-print.at:2915' \
+#AT_STOP_300
+#AT_START_301
+at_fn_group_banner 301 'ofp-print.at:2915' \
   "NXST_FLOW request" "                              " 18
 at_xfail=no
 (
-  $as_echo "300. $at_setup_line: testing $at_desc ..."
+  $as_echo "301. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -36959,7 +36987,7 @@
 01 10 00 20 00 00 00 04 ff ff 00 00 00 00 23 20 \
 00 00 00 00 00 00 00 00 ff ff 00 00 ff 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -36974,13 +37002,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_300
-#AT_START_301
-at_fn_group_banner 301 'ofp-print.at:2925' \
+#AT_STOP_301
+#AT_START_302
+at_fn_group_banner 302 'ofp-print.at:2925' \
   "NXST_FLOW reply" "                                " 18
 at_xfail=no
 (
-  $as_echo "301. $at_setup_line: testing $at_desc ..."
+  $as_echo "302. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37250,7 +37278,7 @@
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 64 00 00 00 00 00 00 19 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37281,13 +37309,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_301
-#AT_START_302
-at_fn_group_banner 302 'ofp-print.at:3079' \
+#AT_STOP_302
+#AT_START_303
+at_fn_group_banner 303 'ofp-print.at:3079' \
   "NXST_AGGREGATE request" "                         " 18
 at_xfail=no
 (
-  $as_echo "302. $at_setup_line: testing $at_desc ..."
+  $as_echo "303. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37301,7 +37329,7 @@
 01 10 00 20 00 00 00 04 ff ff 00 00 00 00 23 20 \
 00 00 00 01 00 00 00 00 ff ff 00 00 ff 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37316,13 +37344,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_302
-#AT_START_303
-at_fn_group_banner 303 'ofp-print.at:3089' \
+#AT_STOP_303
+#AT_START_304
+at_fn_group_banner 304 'ofp-print.at:3089' \
   "NXST_AGGREGATE reply" "                           " 18
 at_xfail=no
 (
-  $as_echo "303. $at_setup_line: testing $at_desc ..."
+  $as_echo "304. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37338,7 +37366,7 @@
 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 07 \
 00 00 00 00 00 00 01 a4 00 00 00 07 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37353,13 +37381,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_303
-#AT_START_304
-at_fn_group_banner 304 'ofp-print.at:3100' \
+#AT_STOP_304
+#AT_START_305
+at_fn_group_banner 305 'ofp-print.at:3100' \
   "NXST_FLOW_MONITOR request" "                      " 18
 at_xfail=no
 (
-  $as_echo "304. $at_setup_line: testing $at_desc ..."
+  $as_echo "305. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37375,7 +37403,7 @@
 00 00 40 00 00 3f ff fe 00 00 01 00 00 00 00 00 \
 00 00 20 00 00 04 ff ff 00 06 02 00 00 00 00 00 00 00 00 02 00 01 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37392,13 +37420,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_304
-#AT_START_305
-at_fn_group_banner 305 'ofp-print.at:3113' \
+#AT_STOP_305
+#AT_START_306
+at_fn_group_banner 306 'ofp-print.at:3113' \
   "NXST_FLOW_MONITOR reply" "                        " 18
 at_xfail=no
 (
-  $as_echo "305. $at_setup_line: testing $at_desc ..."
+  $as_echo "306. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37416,7 +37444,7 @@
 00 00 00 02 00 01 00 00 \
 00 08 00 03 00 01 86 a0 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37433,13 +37461,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_305
-#AT_START_306
-at_fn_group_banner 306 'ofp-print.at:3128' \
+#AT_STOP_306
+#AT_START_307
+at_fn_group_banner 307 'ofp-print.at:3128' \
   "OFPT_BUNDLE_CONTROL - OPEN_REQUEST" "             " 18
 at_xfail=no
 (
-  $as_echo "306. $at_setup_line: testing $at_desc ..."
+  $as_echo "307. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37453,7 +37481,7 @@
 05 21 00 10 00 00 00 00 \
 00 00 00 01 00 00 00 01 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37469,13 +37497,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_306
-#AT_START_307
-at_fn_group_banner 307 'ofp-print.at:3139' \
+#AT_STOP_307
+#AT_START_308
+at_fn_group_banner 308 'ofp-print.at:3139' \
   "OFPT_BUNDLE_CONTROL - OPEN_REQUEST" "             " 18
 at_xfail=no
 (
-  $as_echo "307. $at_setup_line: testing $at_desc ..."
+  $as_echo "308. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37489,7 +37517,7 @@
 05 21 00 10 00 00 00 00 \
 00 00 00 01 00 00 00 02 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37505,13 +37533,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_307
-#AT_START_308
-at_fn_group_banner 308 'ofp-print.at:3150' \
+#AT_STOP_308
+#AT_START_309
+at_fn_group_banner 309 'ofp-print.at:3150' \
   "OFPT_BUNDLE_CONTROL - OPEN_REQUEST" "             " 18
 at_xfail=no
 (
-  $as_echo "308. $at_setup_line: testing $at_desc ..."
+  $as_echo "309. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37525,7 +37553,7 @@
 05 21 00 10 00 00 00 00 \
 00 00 00 01 00 00 00 03 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37541,13 +37569,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_308
-#AT_START_309
-at_fn_group_banner 309 'ofp-print.at:3161' \
+#AT_STOP_309
+#AT_START_310
+at_fn_group_banner 310 'ofp-print.at:3161' \
   "OFPT_BUNDLE_CONTROL - OPEN_REPLY" "               " 18
 at_xfail=no
 (
-  $as_echo "309. $at_setup_line: testing $at_desc ..."
+  $as_echo "310. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37561,7 +37589,7 @@
 05 21 00 10 00 00 00 00 \
 00 00 00 01 00 01 00 01 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37577,13 +37605,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_309
-#AT_START_310
-at_fn_group_banner 310 'ofp-print.at:3172' \
+#AT_STOP_310
+#AT_START_311
+at_fn_group_banner 311 'ofp-print.at:3172' \
   "OFPT_BUNDLE_CONTROL - CLOSE_REQUEST" "            " 18
 at_xfail=no
 (
-  $as_echo "310. $at_setup_line: testing $at_desc ..."
+  $as_echo "311. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37597,7 +37625,7 @@
 05 21 00 10 00 00 00 00 \
 00 00 00 01 00 02 00 01 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37613,13 +37641,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_310
-#AT_START_311
-at_fn_group_banner 311 'ofp-print.at:3183' \
+#AT_STOP_311
+#AT_START_312
+at_fn_group_banner 312 'ofp-print.at:3183' \
   "OFPT_BUNDLE_CONTROL - CLOSE_REPLY" "              " 18
 at_xfail=no
 (
-  $as_echo "311. $at_setup_line: testing $at_desc ..."
+  $as_echo "312. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37633,7 +37661,7 @@
 05 21 00 10 00 00 00 00 \
 00 00 00 01 00 03 00 01 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37649,13 +37677,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_311
-#AT_START_312
-at_fn_group_banner 312 'ofp-print.at:3194' \
+#AT_STOP_312
+#AT_START_313
+at_fn_group_banner 313 'ofp-print.at:3194' \
   "OFPT_BUNDLE_CONTROL - COMMIT_REQUEST" "           " 18
 at_xfail=no
 (
-  $as_echo "312. $at_setup_line: testing $at_desc ..."
+  $as_echo "313. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37669,7 +37697,7 @@
 05 21 00 10 00 00 00 00 \
 00 00 00 01 00 04 00 01 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37685,13 +37713,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_312
-#AT_START_313
-at_fn_group_banner 313 'ofp-print.at:3205' \
+#AT_STOP_313
+#AT_START_314
+at_fn_group_banner 314 'ofp-print.at:3205' \
   "OFPT_BUNDLE_CONTROL - COMMIT_REPLY" "             " 18
 at_xfail=no
 (
-  $as_echo "313. $at_setup_line: testing $at_desc ..."
+  $as_echo "314. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37705,7 +37733,7 @@
 05 21 00 10 00 00 00 00 \
 00 00 00 01 00 05 00 01 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37721,13 +37749,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_313
-#AT_START_314
-at_fn_group_banner 314 'ofp-print.at:3216' \
+#AT_STOP_314
+#AT_START_315
+at_fn_group_banner 315 'ofp-print.at:3216' \
   "OFPT_BUNDLE_CONTROL - DISCARD_REQUEST" "          " 18
 at_xfail=no
 (
-  $as_echo "314. $at_setup_line: testing $at_desc ..."
+  $as_echo "315. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37741,7 +37769,7 @@
 05 21 00 10 00 00 00 00 \
 00 00 00 01 00 06 00 01 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37757,13 +37785,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_314
-#AT_START_315
-at_fn_group_banner 315 'ofp-print.at:3227' \
+#AT_STOP_315
+#AT_START_316
+at_fn_group_banner 316 'ofp-print.at:3227' \
   "OFPT_BUNDLE_CONTROL - DISCARD_REPLY" "            " 18
 at_xfail=no
 (
-  $as_echo "315. $at_setup_line: testing $at_desc ..."
+  $as_echo "316. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37777,7 +37805,7 @@
 05 21 00 10 00 00 00 00 \
 00 00 00 01 00 07 00 01 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37793,13 +37821,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_315
-#AT_START_316
-at_fn_group_banner 316 'ofp-print.at:3238' \
+#AT_STOP_316
+#AT_START_317
+at_fn_group_banner 317 'ofp-print.at:3238' \
   "OFPT_BUNDLE_ADD_MESSAGE - verify xid" "           " 18
 at_xfail=no
 (
-  $as_echo "316. $at_setup_line: testing $at_desc ..."
+  $as_echo "317. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37813,7 +37841,7 @@
 05 22 00 20 00 00 00 00 00 00 00 01 00 00 00 01 \
 05 00 00 08 00 00 00 01 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37828,13 +37856,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_316
-#AT_START_317
-at_fn_group_banner 317 'ofp-print.at:3248' \
+#AT_STOP_317
+#AT_START_318
+at_fn_group_banner 318 'ofp-print.at:3248' \
   "OFPT_BUNDLE_ADD_MESSAGE - reject OFPT_HELLO" "    " 18
 at_xfail=no
 (
-  $as_echo "317. $at_setup_line: testing $at_desc ..."
+  $as_echo "318. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37848,7 +37876,7 @@
 05 22 00 20 00 00 00 00 00 00 00 01 00 00 00 01 \
 05 00 00 10 00 00 00 00 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37863,13 +37891,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_317
-#AT_START_318
-at_fn_group_banner 318 'ofp-print.at:3258' \
+#AT_STOP_318
+#AT_START_319
+at_fn_group_banner 319 'ofp-print.at:3258' \
   "OFPT_BUNDLE_ADD_MESSAGE - FLOW_MOD" "             " 18
 at_xfail=no
 (
-  $as_echo "318. $at_setup_line: testing $at_desc ..."
+  $as_echo "319. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37899,7 +37927,7 @@
 00 01 00 00 00 00 00 00 00 04 00 18 00 00 00 00 \
 00 00 00 10 00 00 00 03 00 00 00 00 00 00 00 00 \
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37916,13 +37944,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_318
-#AT_START_319
-at_fn_group_banner 319 'ofp-print.at:3278' \
+#AT_STOP_319
+#AT_START_320
+at_fn_group_banner 320 'ofp-print.at:3278' \
   "OFPT_BUNDLE_ADD_MESSAGE - PORT_MOD" "             " 18
 at_xfail=no
 (
-  $as_echo "319. $at_setup_line: testing $at_desc ..."
+  $as_echo "320. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -37940,7 +37968,7 @@
 50 54 00 00 00 01 00 00 00 00 00 01 00 00 00 01 \
 00 00 00 08 00 00 00 01
 "
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37960,20 +37988,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_319
-#AT_START_320
-at_fn_group_banner 320 'ofp-util.at:3' \
+#AT_STOP_320
+#AT_START_321
+at_fn_group_banner 321 'ofp-util.at:3' \
   "encoding hellos" "                                " 19
 at_xfail=no
 (
-  $as_echo "320. $at_setup_line: testing $at_desc ..."
+  $as_echo "321. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/ofp-util.at:5: ovs-ofctl encode-hello 0x2"
 at_fn_check_prepare_trace "ofp-util.at:5"
 ( $at_check_trace; ovs-ofctl encode-hello 0x2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -37990,7 +38018,7 @@
 $as_echo "$at_srcdir/ofp-util.at:10: ovs-ofctl encode-hello 0x6"
 at_fn_check_prepare_trace "ofp-util.at:10"
 ( $at_check_trace; ovs-ofctl encode-hello 0x6
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38007,7 +38035,7 @@
 $as_echo "$at_srcdir/ofp-util.at:15: ovs-ofctl encode-hello 0xe"
 at_fn_check_prepare_trace "ofp-util.at:15"
 ( $at_check_trace; ovs-ofctl encode-hello 0xe
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38024,7 +38052,7 @@
 $as_echo "$at_srcdir/ofp-util.at:20: ovs-ofctl encode-hello 0x1e"
 at_fn_check_prepare_trace "ofp-util.at:20"
 ( $at_check_trace; ovs-ofctl encode-hello 0x1e
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38041,7 +38069,7 @@
 $as_echo "$at_srcdir/ofp-util.at:25: ovs-ofctl encode-hello 0x3e"
 at_fn_check_prepare_trace "ofp-util.at:25"
 ( $at_check_trace; ovs-ofctl encode-hello 0x3e
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38059,7 +38087,7 @@
 $as_echo "$at_srcdir/ofp-util.at:32: ovs-ofctl encode-hello 0xc"
 at_fn_check_prepare_trace "ofp-util.at:32"
 ( $at_check_trace; ovs-ofctl encode-hello 0xc
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38076,7 +38104,7 @@
 $as_echo "$at_srcdir/ofp-util.at:37: ovs-ofctl encode-hello 0xa"
 at_fn_check_prepare_trace "ofp-util.at:37"
 ( $at_check_trace; ovs-ofctl encode-hello 0xa
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38093,7 +38121,7 @@
 $as_echo "$at_srcdir/ofp-util.at:42: ovs-ofctl encode-hello 0x8"
 at_fn_check_prepare_trace "ofp-util.at:42"
 ( $at_check_trace; ovs-ofctl encode-hello 0x8
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38110,7 +38138,7 @@
 $as_echo "$at_srcdir/ofp-util.at:47: ovs-ofctl encode-hello 0x4"
 at_fn_check_prepare_trace "ofp-util.at:47"
 ( $at_check_trace; ovs-ofctl encode-hello 0x4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38127,13 +38155,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_320
-#AT_START_321
-at_fn_group_banner 321 'ofp-errors.at:3' \
+#AT_STOP_321
+#AT_START_322
+at_fn_group_banner 322 'ofp-errors.at:3' \
   "OFPT_ERROR with type OFPET_HELLO_FAILED - OF1.0" "" 20
 at_xfail=no
 (
-  $as_echo "321. $at_setup_line: testing $at_desc ..."
+  $as_echo "322. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38141,7 +38169,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:5: ovs-ofctl ofp-print 010100170000000000000001657874726120646174610a"
 at_fn_check_prepare_trace "ofp-errors.at:5"
 ( $at_check_trace; ovs-ofctl ofp-print 010100170000000000000001657874726120646174610a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38157,13 +38185,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_321
-#AT_START_322
-at_fn_group_banner 322 'ofp-errors.at:11' \
+#AT_STOP_322
+#AT_START_323
+at_fn_group_banner 323 'ofp-errors.at:11' \
   "OFPT_ERROR with type OFPET_HELLO_FAILED - OF1.1" "" 20
 at_xfail=no
 (
-  $as_echo "322. $at_setup_line: testing $at_desc ..."
+  $as_echo "323. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38171,7 +38199,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:13: ovs-ofctl ofp-print 020100170000000000000001657874726120646174610a"
 at_fn_check_prepare_trace "ofp-errors.at:13"
 ( $at_check_trace; ovs-ofctl ofp-print 020100170000000000000001657874726120646174610a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38187,13 +38215,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_322
-#AT_START_323
-at_fn_group_banner 323 'ofp-errors.at:19' \
+#AT_STOP_323
+#AT_START_324
+at_fn_group_banner 324 'ofp-errors.at:19' \
   "OFPT_ERROR with type OFPET_BAD_REQUEST - OF1.0" " " 20
 at_xfail=no
 (
-  $as_echo "323. $at_setup_line: testing $at_desc ..."
+  $as_echo "324. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38201,7 +38229,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:21: ovs-ofctl ofp-print 0101001400000000000100060105ccddeeff0011"
 at_fn_check_prepare_trace "ofp-errors.at:21"
 ( $at_check_trace; ovs-ofctl ofp-print 0101001400000000000100060105ccddeeff0011
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38219,13 +38247,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_323
-#AT_START_324
-at_fn_group_banner 324 'ofp-errors.at:29' \
+#AT_STOP_324
+#AT_START_325
+at_fn_group_banner 325 'ofp-errors.at:29' \
   "OFPT_ERROR prints type of truncated inner messages" "" 20
 at_xfail=no
 (
-  $as_echo "324. $at_setup_line: testing $at_desc ..."
+  $as_echo "325. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38241,7 +38269,7 @@
 00 00 01 00 02 00 00 00 00 00 00 87 00 00 0f ff \
 ff fe 50 54 00 00 00 01 62 72 30 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 01"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38262,13 +38290,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_324
-#AT_START_325
-at_fn_group_banner 325 'ofp-errors.at:46' \
+#AT_STOP_325
+#AT_START_326
+at_fn_group_banner 326 'ofp-errors.at:46' \
   "OFPT_ERROR with code OFPBMC_BAD_PREREQ - OF1.0" " " 20
 at_xfail=no
 (
-  $as_echo "325. $at_setup_line: testing $at_desc ..."
+  $as_echo "326. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38276,7 +38304,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:48: ovs-ofctl ofp-print '0101001c55555555 b0c20000 0000232000010104 0102000811111111'"
 at_fn_check_prepare_trace "ofp-errors.at:48"
 ( $at_check_trace; ovs-ofctl ofp-print '0101001c55555555 b0c20000 0000232000010104 0102000811111111'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38292,13 +38320,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_325
-#AT_START_326
-at_fn_group_banner 326 'ofp-errors.at:54' \
+#AT_STOP_326
+#AT_START_327
+at_fn_group_banner 327 'ofp-errors.at:54' \
   "OFPT_ERROR with code OFPBMC_BAD_PREREQ - OF1.1" " " 20
 at_xfail=no
 (
-  $as_echo "326. $at_setup_line: testing $at_desc ..."
+  $as_echo "327. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38306,7 +38334,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:56: ovs-ofctl ofp-print '0201001c55555555 b0c20000 0000232000010104 0102000811111111'"
 at_fn_check_prepare_trace "ofp-errors.at:56"
 ( $at_check_trace; ovs-ofctl ofp-print '0201001c55555555 b0c20000 0000232000010104 0102000811111111'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38322,13 +38350,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_326
-#AT_START_327
-at_fn_group_banner 327 'ofp-errors.at:64' \
+#AT_STOP_327
+#AT_START_328
+at_fn_group_banner 328 'ofp-errors.at:64' \
   "OFPT_ERROR with type OFPFMFC_OVERLAP - OF1.0" "   " 20
 at_xfail=no
 (
-  $as_echo "327. $at_setup_line: testing $at_desc ..."
+  $as_echo "328. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38336,7 +38364,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:66: ovs-ofctl ofp-print 0101001400000000000300010106ccddeeff0011"
 at_fn_check_prepare_trace "ofp-errors.at:66"
 ( $at_check_trace; ovs-ofctl ofp-print 0101001400000000000300010106ccddeeff0011
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38354,13 +38382,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_327
-#AT_START_328
-at_fn_group_banner 328 'ofp-errors.at:73' \
+#AT_STOP_328
+#AT_START_329
+at_fn_group_banner 329 'ofp-errors.at:73' \
   "OFPT_ERROR with type OFPBIC_UNSUP_INST - OF1.1" " " 20
 at_xfail=no
 (
-  $as_echo "328. $at_setup_line: testing $at_desc ..."
+  $as_echo "329. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38368,7 +38396,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:75: ovs-ofctl ofp-print 0201001400000000000300010206ccddeeff0011"
 at_fn_check_prepare_trace "ofp-errors.at:75"
 ( $at_check_trace; ovs-ofctl ofp-print 0201001400000000000300010206ccddeeff0011
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38386,13 +38414,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_328
-#AT_START_329
-at_fn_group_banner 329 'ofp-errors.at:83' \
+#AT_STOP_329
+#AT_START_330
+at_fn_group_banner 330 'ofp-errors.at:83' \
   "OFPT_ERROR with type OFPBIC_DUP_INST - OF1.4" "   " 20
 at_xfail=no
 (
-  $as_echo "329. $at_setup_line: testing $at_desc ..."
+  $as_echo "330. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38400,7 +38428,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:85: ovs-ofctl ofp-print 0501001400000000000300090206ccddeeff0011"
 at_fn_check_prepare_trace "ofp-errors.at:85"
 ( $at_check_trace; ovs-ofctl ofp-print 0501001400000000000300090206ccddeeff0011
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38418,13 +38446,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_329
-#AT_START_330
-at_fn_group_banner 330 'ofp-errors.at:97' \
+#AT_STOP_330
+#AT_START_331
+at_fn_group_banner 331 'ofp-errors.at:97' \
   "encoding OFPBIC_* experimenter errors" "          " 20
 at_xfail=no
 (
-  $as_echo "330. $at_setup_line: testing $at_desc ..."
+  $as_echo "331. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38432,7 +38460,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:99: ovs-ofctl print-error OFPBIC_BAD_EXPERIMENTER"
 at_fn_check_prepare_trace "ofp-errors.at:99"
 ( $at_check_trace; ovs-ofctl print-error OFPBIC_BAD_EXPERIMENTER
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38451,7 +38479,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:106: ovs-ofctl print-error OFPBIC_BAD_EXP_TYPE"
 at_fn_check_prepare_trace "ofp-errors.at:106"
 ( $at_check_trace; ovs-ofctl print-error OFPBIC_BAD_EXP_TYPE
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38470,13 +38498,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_330
-#AT_START_331
-at_fn_group_banner 331 'ofp-errors.at:117' \
+#AT_STOP_331
+#AT_START_332
+at_fn_group_banner 332 'ofp-errors.at:117' \
   "encoding errors extension that became official" " " 20
 at_xfail=no
 (
-  $as_echo "331. $at_setup_line: testing $at_desc ..."
+  $as_echo "332. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38484,7 +38512,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:119: ovs-ofctl encode-error-reply OFPRRFC_BAD_ROLE 0100000812345678"
 at_fn_check_prepare_trace "ofp-errors.at:119"
 ( $at_check_trace; ovs-ofctl encode-error-reply OFPRRFC_BAD_ROLE 0100000812345678
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38500,7 +38528,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:124: ovs-ofctl encode-error-reply OFPRRFC_BAD_ROLE 0200000812345678"
 at_fn_check_prepare_trace "ofp-errors.at:124"
 ( $at_check_trace; ovs-ofctl encode-error-reply OFPRRFC_BAD_ROLE 0200000812345678
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38516,7 +38544,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:129: ovs-ofctl encode-error-reply OFPRRFC_BAD_ROLE 0300000812345678"
 at_fn_check_prepare_trace "ofp-errors.at:129"
 ( $at_check_trace; ovs-ofctl encode-error-reply OFPRRFC_BAD_ROLE 0300000812345678
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38532,13 +38560,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_331
-#AT_START_332
-at_fn_group_banner 332 'ofp-errors.at:136' \
+#AT_STOP_332
+#AT_START_333
+at_fn_group_banner 333 'ofp-errors.at:136' \
   "decoding OFPBIC_* experimenter errors" "          " 20
 at_xfail=no
 (
-  $as_echo "332. $at_setup_line: testing $at_desc ..."
+  $as_echo "333. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38546,7 +38574,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:138: ovs-ofctl ofp-print '0201001455555555 00030005 0102000811111111'"
 at_fn_check_prepare_trace "ofp-errors.at:138"
 ( $at_check_trace; ovs-ofctl ofp-print '0201001455555555 00030005 0102000811111111'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38562,7 +38590,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:142: ovs-ofctl ofp-print '0301001455555555 00030005 0102000811111111'"
 at_fn_check_prepare_trace "ofp-errors.at:142"
 ( $at_check_trace; ovs-ofctl ofp-print '0301001455555555 00030005 0102000811111111'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38578,7 +38606,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:146: ovs-ofctl ofp-print '0301001455555555 00030006 0102000811111111'"
 at_fn_check_prepare_trace "ofp-errors.at:146"
 ( $at_check_trace; ovs-ofctl ofp-print '0301001455555555 00030006 0102000811111111'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38594,13 +38622,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_332
-#AT_START_333
-at_fn_group_banner 333 'ofp-errors.at:152' \
+#AT_STOP_333
+#AT_START_334
+at_fn_group_banner 334 'ofp-errors.at:152' \
   "decoding experimenter errors" "                   " 20
 at_xfail=no
 (
-  $as_echo "333. $at_setup_line: testing $at_desc ..."
+  $as_echo "334. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38608,7 +38636,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:154: ovs-ofctl ofp-print '0101001c55555555 b0c20000 0000232000010203 0102000811111111'"
 at_fn_check_prepare_trace "ofp-errors.at:154"
 ( $at_check_trace; ovs-ofctl ofp-print '0101001c55555555 b0c20000 0000232000010203 0102000811111111'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38624,7 +38652,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:158: ovs-ofctl ofp-print '0201001c55555555 b0c20000 0000232000010203 0102000811111111'"
 at_fn_check_prepare_trace "ofp-errors.at:158"
 ( $at_check_trace; ovs-ofctl ofp-print '0201001c55555555 b0c20000 0000232000010203 0102000811111111'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38640,7 +38668,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:162: ovs-ofctl ofp-print '0301001855555555 ffff0004 00002320 0102000811111111'"
 at_fn_check_prepare_trace "ofp-errors.at:162"
 ( $at_check_trace; ovs-ofctl ofp-print '0301001855555555 ffff0004 00002320 0102000811111111'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38657,7 +38685,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:167: ovs-ofctl ofp-print '0301001812345678 ffff0a28 4f4e4600 0300000812345678'"
 at_fn_check_prepare_trace "ofp-errors.at:167"
 ( $at_check_trace; ovs-ofctl ofp-print '0301001812345678 ffff0a28 4f4e4600 0300000812345678'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38674,7 +38702,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:172: ovs-ofctl ofp-print '0401001812345678 ffff0a28 4f4e4600 0400000812345678'"
 at_fn_check_prepare_trace "ofp-errors.at:172"
 ( $at_check_trace; ovs-ofctl ofp-print '0401001812345678 ffff0a28 4f4e4600 0400000812345678'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38691,7 +38719,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:177: ovs-ofctl ofp-print '0501001412345678 00030009 0500000812345678'"
 at_fn_check_prepare_trace "ofp-errors.at:177"
 ( $at_check_trace; ovs-ofctl ofp-print '0501001412345678 00030009 0500000812345678'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38708,13 +38736,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_333
-#AT_START_334
-at_fn_group_banner 334 'ofp-errors.at:184' \
+#AT_STOP_334
+#AT_START_335
+at_fn_group_banner 335 'ofp-errors.at:184' \
   "encoding experimenter errors" "                   " 20
 at_xfail=no
 (
-  $as_echo "334. $at_setup_line: testing $at_desc ..."
+  $as_echo "335. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -38725,7 +38753,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:189: ovs-ofctl encode-error-reply NXBRC_MUST_BE_ZERO 0100000812345678"
 at_fn_check_prepare_trace "ofp-errors.at:189"
 ( $at_check_trace; ovs-ofctl encode-error-reply NXBRC_MUST_BE_ZERO 0100000812345678
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38741,7 +38769,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:194: ovs-ofctl encode-error-reply NXBRC_MUST_BE_ZERO 0200000812345678"
 at_fn_check_prepare_trace "ofp-errors.at:194"
 ( $at_check_trace; ovs-ofctl encode-error-reply NXBRC_MUST_BE_ZERO 0200000812345678
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38757,7 +38785,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:199: ovs-ofctl encode-error-reply NXBRC_MUST_BE_ZERO 0300000812345678"
 at_fn_check_prepare_trace "ofp-errors.at:199"
 ( $at_check_trace; ovs-ofctl encode-error-reply NXBRC_MUST_BE_ZERO 0300000812345678
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38779,7 +38807,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:210: ovs-ofctl '-vPATTERN:console:%c|%p|%m' encode-error-reply OFPBIC_DUP_INST 0100000812345678"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofp-errors.at:210"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' encode-error-reply OFPBIC_DUP_INST 0100000812345678
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ofp_errors|ERR|cannot encode OFPBIC_DUP_INST for OpenFlow 1.0
@@ -38797,7 +38825,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:216: ovs-ofctl encode-error-reply OFPBIC_DUP_INST 0200000812345678"
 at_fn_check_prepare_trace "ofp-errors.at:216"
 ( $at_check_trace; ovs-ofctl encode-error-reply OFPBIC_DUP_INST 0200000812345678
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38813,7 +38841,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:220: ovs-ofctl encode-error-reply OFPBIC_DUP_INST 0300000812345678"
 at_fn_check_prepare_trace "ofp-errors.at:220"
 ( $at_check_trace; ovs-ofctl encode-error-reply OFPBIC_DUP_INST 0300000812345678
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38829,7 +38857,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:224: ovs-ofctl encode-error-reply OFPBIC_DUP_INST 0400000812345678"
 at_fn_check_prepare_trace "ofp-errors.at:224"
 ( $at_check_trace; ovs-ofctl encode-error-reply OFPBIC_DUP_INST 0400000812345678
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38845,7 +38873,7 @@
 $as_echo "$at_srcdir/ofp-errors.at:228: ovs-ofctl encode-error-reply OFPBIC_DUP_INST 0500000812345678"
 at_fn_check_prepare_trace "ofp-errors.at:228"
 ( $at_check_trace; ovs-ofctl encode-error-reply OFPBIC_DUP_INST 0500000812345678
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -38861,13 +38889,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_334
-#AT_START_335
-at_fn_group_banner 335 'ovs-ofctl.at:3' \
+#AT_STOP_335
+#AT_START_336
+at_fn_group_banner 336 'ovs-ofctl.at:3' \
   "ovs-ofctl parse-flows choice of protocol" "       " 21
 at_xfail=no
 (
-  $as_echo "335. $at_setup_line: testing $at_desc ..."
+  $as_echo "336. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # This doesn't cover some potential vlan_tci test cases.
@@ -38997,7 +39025,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:127: ovs-ofctl parse-flow \"\$1,actions=drop\""
 at_fn_check_prepare_dynamic "ovs-ofctl parse-flow \"$1,actions=drop\"" "ovs-ofctl.at:127"
 ( $at_check_trace; ovs-ofctl parse-flow "$1,actions=drop"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: no usable protocol
@@ -39015,7 +39043,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:133: ovs-ofctl parse-flow \"\$1,actions=drop\" | sed 1q"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:133"
 ( $at_check_trace; ovs-ofctl parse-flow "$1,actions=drop" | sed 1q
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -39032,13 +39060,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_335
-#AT_START_336
-at_fn_group_banner 336 'ovs-ofctl.at:140' \
+#AT_STOP_336
+#AT_START_337
+at_fn_group_banner 337 'ovs-ofctl.at:140' \
   "ovs-ofctl parse-flows (OpenFlow 1.0)" "           " 21
 at_xfail=no
 (
-  $as_echo "336. $at_setup_line: testing $at_desc ..."
+  $as_echo "337. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >flows.txt <<'_ATEOF'
@@ -39065,7 +39093,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:157"
 ( $at_check_trace; ovs-ofctl parse-flows flows.txt
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -39078,7 +39106,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:159: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ovs-ofctl.at:159"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -39106,13 +39134,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_336
-#AT_START_337
-at_fn_group_banner 337 'ovs-ofctl.at:177' \
+#AT_STOP_337
+#AT_START_338
+at_fn_group_banner 338 'ovs-ofctl.at:177' \
   "ovs-ofctl parse-flows (OpenFlow 1.1)" "           " 21
 at_xfail=no
 (
-  $as_echo "337. $at_setup_line: testing $at_desc ..."
+  $as_echo "338. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >flows.txt <<'_ATEOF'
@@ -39139,7 +39167,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:194"
 ( $at_check_trace; ovs-ofctl --protocols OpenFlow11 parse-flows flows.txt
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -39152,7 +39180,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:196: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ovs-ofctl.at:196"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -39180,13 +39208,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_337
-#AT_START_338
-at_fn_group_banner 338 'ovs-ofctl.at:214' \
+#AT_STOP_338
+#AT_START_339
+at_fn_group_banner 339 'ovs-ofctl.at:214' \
   "ovs-ofctl parse-flows (OpenFlow 1.2)" "           " 21
 at_xfail=no
 (
-  $as_echo "338. $at_setup_line: testing $at_desc ..."
+  $as_echo "339. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >flows.txt <<'_ATEOF'
@@ -39217,7 +39245,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:235"
 ( $at_check_trace; ovs-ofctl --protocols OpenFlow12 parse-flows flows.txt
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -39230,7 +39258,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:237: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ovs-ofctl.at:237"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -39262,13 +39290,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_338
-#AT_START_339
-at_fn_group_banner 339 'ovs-ofctl.at:259' \
+#AT_STOP_339
+#AT_START_340
+at_fn_group_banner 340 'ovs-ofctl.at:259' \
   "ovs-ofctl parse-flow with invalid mask" "         " 21
 at_xfail=no
 (
-  $as_echo "339. $at_setup_line: testing $at_desc ..."
+  $as_echo "340. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 for test_case in \
@@ -39307,7 +39335,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:292: ovs-ofctl parse-flow \"\$prereq\$field=\$value,actions=drop\""
 at_fn_check_prepare_dynamic "ovs-ofctl parse-flow \"$prereq$field=$value,actions=drop\"" "ovs-ofctl.at:292"
 ( $at_check_trace; ovs-ofctl parse-flow "$prereq$field=$value,actions=drop"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: $value: invalid mask for field $field
@@ -39323,13 +39351,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_339
-#AT_START_340
-at_fn_group_banner 340 'ovs-ofctl.at:298' \
+#AT_STOP_340
+#AT_START_341
+at_fn_group_banner 341 'ovs-ofctl.at:298' \
   "ovs-ofctl action inconsistency (OpenFlow 1.1)" "  " 21
 at_xfail=no
 (
-  $as_echo "340. $at_setup_line: testing $at_desc ..."
+  $as_echo "341. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
@@ -39338,7 +39366,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:299"
 ( $at_check_trace; ovs-ofctl --protocols OpenFlow11 add-flow br0 'ip actions=mod_tp_dst:1234'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: none of the usable flow formats (OpenFlow10,NXM) is among the allowed flow formats (OpenFlow11)
@@ -39353,13 +39381,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_340
-#AT_START_341
-at_fn_group_banner 341 'ovs-ofctl.at:304' \
+#AT_STOP_341
+#AT_START_342
+at_fn_group_banner 342 'ovs-ofctl.at:304' \
   "ovs-ofctl parse-flows (With Tunnel-Parameters)" " " 21
 at_xfail=no
 (
-  $as_echo "341. $at_setup_line: testing $at_desc ..."
+  $as_echo "342. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >flows.txt <<'_ATEOF'
@@ -39374,7 +39402,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:309"
 ( $at_check_trace; ovs-ofctl parse-flows flows.txt
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -39390,13 +39418,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_341
-#AT_START_342
-at_fn_group_banner 342 'ovs-ofctl.at:316' \
+#AT_STOP_342
+#AT_START_343
+at_fn_group_banner 343 'ovs-ofctl.at:316' \
   "ovs-ofctl parse-flows (skb_priority)" "           " 21
 at_xfail=no
 (
-  $as_echo "342. $at_setup_line: testing $at_desc ..."
+  $as_echo "343. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >flows.txt <<'_ATEOF'
@@ -39411,7 +39439,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:321"
 ( $at_check_trace; ovs-ofctl parse-flows flows.txt
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -39427,13 +39455,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_342
-#AT_START_343
-at_fn_group_banner 343 'ovs-ofctl.at:328' \
+#AT_STOP_343
+#AT_START_344
+at_fn_group_banner 344 'ovs-ofctl.at:328' \
   "ovs-ofctl parse-flows (NXM)" "                    " 21
 at_xfail=no
 (
-  $as_echo "343. $at_setup_line: testing $at_desc ..."
+  $as_echo "344. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >flows.txt <<'_ATEOF'
@@ -39477,7 +39505,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:362"
 ( $at_check_trace; ovs-ofctl parse-flows flows.txt
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -39490,7 +39518,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:364: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ovs-ofctl.at:364"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -39535,13 +39563,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_343
-#AT_START_344
-at_fn_group_banner 344 'ovs-ofctl.at:399' \
+#AT_STOP_344
+#AT_START_345
+at_fn_group_banner 345 'ovs-ofctl.at:399' \
   "ovs-ofctl -F nxm parse-flows" "                   " 21
 at_xfail=no
 (
-  $as_echo "344. $at_setup_line: testing $at_desc ..."
+  $as_echo "345. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >flows.txt <<'_ATEOF'
@@ -39581,7 +39609,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:431: ovs-ofctl -F nxm parse-flows flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:431"
 ( $at_check_trace; ovs-ofctl -F nxm parse-flows flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -39594,7 +39622,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:432: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ovs-ofctl.at:432"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -39638,13 +39666,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_344
-#AT_START_345
-at_fn_group_banner 345 'ovs-ofctl.at:466' \
+#AT_STOP_345
+#AT_START_346
+at_fn_group_banner 346 'ovs-ofctl.at:466' \
   "ovs-ofctl -F nxm -mmm parse-flows" "              " 21
 at_xfail=no
 (
-  $as_echo "345. $at_setup_line: testing $at_desc ..."
+  $as_echo "346. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >flows.txt <<'_ATEOF'
@@ -39683,7 +39711,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:497: ovs-ofctl -F nxm -mmm parse-flows flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:497"
 ( $at_check_trace; ovs-ofctl -F nxm -mmm parse-flows flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -39696,7 +39724,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:498: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ovs-ofctl.at:498"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -39739,13 +39767,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_345
-#AT_START_346
-at_fn_group_banner 346 'ovs-ofctl.at:531' \
+#AT_STOP_346
+#AT_START_347
+at_fn_group_banner 347 'ovs-ofctl.at:531' \
   "ovs-ofctl parse-nx-match" "                       " 21
 at_xfail=no
 (
-  $as_echo "346. $at_setup_line: testing $at_desc ..."
+  $as_echo "347. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -40045,7 +40073,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:824: ovs-ofctl -vPATTERN:'console:%c|%p|%m' --strict parse-nx-match < nx-match.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:824"
 ( $at_check_trace; ovs-ofctl -vPATTERN:'console:%c|%p|%m' --strict parse-nx-match < nx-match.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -40351,7 +40379,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:1118: grep '1-bits in value' stderr | sed 1q"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:1118"
 ( $at_check_trace; grep '1-bits in value' stderr | sed 1q
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -40368,7 +40396,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:1123: grep -v '1-bits in value' stderr"
 at_fn_check_prepare_trace "ovs-ofctl.at:1123"
 ( $at_check_trace; grep -v '1-bits in value' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -40381,13 +40409,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_346
-#AT_START_347
-at_fn_group_banner 347 'ovs-ofctl.at:1126' \
+#AT_STOP_347
+#AT_START_348
+at_fn_group_banner 348 'ovs-ofctl.at:1126' \
   "ovs-ofctl parse-ofp10-match" "                    " 21
 at_xfail=no
 (
-  $as_echo "347. $at_setup_line: testing $at_desc ..."
+  $as_echo "348. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -40557,7 +40585,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:1336: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-ofp10-match < input.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:1336"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-ofp10-match < input.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -40573,13 +40601,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_347
-#AT_START_348
-at_fn_group_banner 348 'ovs-ofctl.at:1341' \
+#AT_STOP_348
+#AT_START_349
+at_fn_group_banner 349 'ovs-ofctl.at:1341' \
   "ovs-ofctl parse-ofp11-match" "                    " 21
 at_xfail=no
 (
-  $as_echo "348. $at_setup_line: testing $at_desc ..."
+  $as_echo "349. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -40759,7 +40787,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:1662: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-ofp11-match < input.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:1662"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-ofp11-match < input.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -40775,13 +40803,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_348
-#AT_START_349
-at_fn_group_banner 349 'ovs-ofctl.at:1667' \
+#AT_STOP_349
+#AT_START_350
+at_fn_group_banner 350 'ovs-ofctl.at:1667' \
   "ovs-ofctl parse-nx-match loose" "                 " 21
 at_xfail=no
 (
-  $as_echo "349. $at_setup_line: testing $at_desc ..."
+  $as_echo "350. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -40796,7 +40824,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:1675: ovs-ofctl --strict parse-nx-match < nx-match.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:1675"
 ( $at_check_trace; ovs-ofctl --strict parse-nx-match < nx-match.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -40814,7 +40842,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:1681: ovs-ofctl parse-nx-match < nx-match.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:1681"
 ( $at_check_trace; ovs-ofctl parse-nx-match < nx-match.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -40831,13 +40859,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_349
-#AT_START_350
-at_fn_group_banner 350 'ovs-ofctl.at:1688' \
+#AT_STOP_350
+#AT_START_351
+at_fn_group_banner 351 'ovs-ofctl.at:1688' \
   "ovs-ofctl parse-oxm (OpenFlow 1.2)" "             " 21
 at_xfail=no
 (
-  $as_echo "350. $at_setup_line: testing $at_desc ..."
+  $as_echo "351. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -41086,7 +41114,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:1930: ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow12 < oxm.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:1930"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow12 < oxm.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -41341,7 +41369,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2174: grep '1-bits in value' stderr | sed 1q"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2174"
 ( $at_check_trace; grep '1-bits in value' stderr | sed 1q
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41358,7 +41386,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2179: grep -v '1-bits in value' stderr"
 at_fn_check_prepare_trace "ovs-ofctl.at:2179"
 ( $at_check_trace; grep -v '1-bits in value' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41371,13 +41399,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_350
-#AT_START_351
-at_fn_group_banner 351 'ovs-ofctl.at:2182' \
+#AT_STOP_351
+#AT_START_352
+at_fn_group_banner 352 'ovs-ofctl.at:2182' \
   "ovs-ofctl parse-oxm (OpenFlow 1.3)" "             " 21
 at_xfail=no
 (
-  $as_echo "351. $at_setup_line: testing $at_desc ..."
+  $as_echo "352. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -41395,7 +41423,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2193: ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow13 < oxm.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2193"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow13 < oxm.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41416,13 +41444,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_351
-#AT_START_352
-at_fn_group_banner 352 'ovs-ofctl.at:2205' \
+#AT_STOP_352
+#AT_START_353
+at_fn_group_banner 353 'ovs-ofctl.at:2205' \
   "ovs-ofctl parse-oxm (OpenFlow 1.5)" "             " 21
 at_xfail=no
 (
-  $as_echo "352. $at_setup_line: testing $at_desc ..."
+  $as_echo "353. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -41461,7 +41489,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2237: ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow15 < oxm.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2237"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow15 < oxm.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41503,13 +41531,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_352
-#AT_START_353
-at_fn_group_banner 353 'ovs-ofctl.at:2270' \
+#AT_STOP_353
+#AT_START_354
+at_fn_group_banner 354 'ovs-ofctl.at:2270' \
   "ovs-ofctl parse-oxm loose" "                      " 21
 at_xfail=no
 (
-  $as_echo "353. $at_setup_line: testing $at_desc ..."
+  $as_echo "354. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -41524,7 +41552,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2278: ovs-ofctl --strict parse-oxm OpenFlow12 < oxm.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2278"
 ( $at_check_trace; ovs-ofctl --strict parse-oxm OpenFlow12 < oxm.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41542,7 +41570,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2284: ovs-ofctl parse-oxm OpenFlow12 < oxm.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2284"
 ( $at_check_trace; ovs-ofctl parse-oxm OpenFlow12 < oxm.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41559,13 +41587,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_353
-#AT_START_354
-at_fn_group_banner 354 'ovs-ofctl.at:2291' \
+#AT_STOP_354
+#AT_START_355
+at_fn_group_banner 355 'ovs-ofctl.at:2291' \
   "experimenter OXM encoding" "                      " 21
 at_xfail=no
 (
-  $as_echo "354. $at_setup_line: testing $at_desc ..."
+  $as_echo "355. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >oxm.txt <<'_ATEOF'
@@ -41590,7 +41618,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2309: ovs-ofctl -m --strict parse-oxm OpenFlow15 < oxm.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2309"
 ( $at_check_trace; ovs-ofctl -m --strict parse-oxm OpenFlow15 < oxm.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41618,7 +41646,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2325: ovs-ofctl -m --strict parse-oxm OpenFlow12 < oxm.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2325"
 ( $at_check_trace; ovs-ofctl -m --strict parse-oxm OpenFlow12 < oxm.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41641,13 +41669,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_354
-#AT_START_355
-at_fn_group_banner 355 'ovs-ofctl.at:2338' \
+#AT_STOP_355
+#AT_START_356
+at_fn_group_banner 356 'ovs-ofctl.at:2338' \
   "check TCP flags expression in OXM and NXM" "      " 21
 at_xfail=no
 (
-  $as_echo "355. $at_setup_line: testing $at_desc ..."
+  $as_echo "356. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # NXM/OXM input for matching on TCP flags.
@@ -41658,7 +41686,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2343: echo \"\$tcp_flags\" | ovs-ofctl parse-nxm"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2343"
 ( $at_check_trace; echo "$tcp_flags" | ovs-ofctl parse-nxm
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41676,7 +41704,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2349: echo \"\$tcp_flags\" | ovs-ofctl parse-oxm OpenFlow12"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2349"
 ( $at_check_trace; echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow12
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41694,7 +41722,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2355: echo \"\$tcp_flags\" | ovs-ofctl parse-oxm OpenFlow13"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2355"
 ( $at_check_trace; echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow13
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41709,7 +41737,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2358: echo \"\$tcp_flags\" | ovs-ofctl parse-oxm OpenFlow14"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2358"
 ( $at_check_trace; echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow14
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41726,7 +41754,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2363: echo \"\$tcp_flags\" | ovs-ofctl parse-oxm OpenFlow15"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2363"
 ( $at_check_trace; echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow15
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41741,13 +41769,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_355
-#AT_START_356
-at_fn_group_banner 356 'ovs-ofctl.at:2370' \
+#AT_STOP_356
+#AT_START_357
+at_fn_group_banner 357 'ovs-ofctl.at:2370' \
   "ovs-ofctl check-vlan" "                           " 21
 at_xfail=no
 (
-  $as_echo "356. $at_setup_line: testing $at_desc ..."
+  $as_echo "357. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -41756,7 +41784,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2374: ovs-ofctl check-vlan 0000 0000"
 at_fn_check_prepare_trace "ovs-ofctl.at:2374"
 ( $at_check_trace; ovs-ofctl check-vlan 0000 0000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41776,7 +41804,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2383: ovs-ofctl check-vlan 0000 ffff"
 at_fn_check_prepare_trace "ovs-ofctl.at:2383"
 ( $at_check_trace; ovs-ofctl check-vlan 0000 ffff
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41796,7 +41824,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2392: ovs-ofctl check-vlan 1abc 1fff"
 at_fn_check_prepare_trace "ovs-ofctl.at:2392"
 ( $at_check_trace; ovs-ofctl check-vlan 1abc 1fff
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41816,7 +41844,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2401: ovs-ofctl check-vlan b000 f000"
 at_fn_check_prepare_trace "ovs-ofctl.at:2401"
 ( $at_check_trace; ovs-ofctl check-vlan b000 f000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41836,7 +41864,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2410: ovs-ofctl check-vlan babc ffff"
 at_fn_check_prepare_trace "ovs-ofctl.at:2410"
 ( $at_check_trace; ovs-ofctl check-vlan babc ffff
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41856,7 +41884,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2419: ovs-ofctl check-vlan 0000 0fff"
 at_fn_check_prepare_trace "ovs-ofctl.at:2419"
 ( $at_check_trace; ovs-ofctl check-vlan 0000 0fff
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41876,7 +41904,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2428: ovs-ofctl check-vlan 0000 f000"
 at_fn_check_prepare_trace "ovs-ofctl.at:2428"
 ( $at_check_trace; ovs-ofctl check-vlan 0000 f000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41896,7 +41924,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2437: ovs-ofctl check-vlan 0000 efff"
 at_fn_check_prepare_trace "ovs-ofctl.at:2437"
 ( $at_check_trace; ovs-ofctl check-vlan 0000 efff
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41916,7 +41944,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2446: ovs-ofctl check-vlan 1001 1001"
 at_fn_check_prepare_trace "ovs-ofctl.at:2446"
 ( $at_check_trace; ovs-ofctl check-vlan 1001 1001
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41936,7 +41964,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2455: ovs-ofctl check-vlan 3000 3000"
 at_fn_check_prepare_trace "ovs-ofctl.at:2455"
 ( $at_check_trace; ovs-ofctl check-vlan 3000 3000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41955,7 +41983,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2462: "
 at_fn_check_prepare_trace "ovs-ofctl.at:2462"
 ( $at_check_trace;
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -41968,20 +41996,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_356
-#AT_START_357
-at_fn_group_banner 357 'ovs-ofctl.at:2467' \
+#AT_STOP_357
+#AT_START_358
+at_fn_group_banner 358 'ovs-ofctl.at:2467' \
   "ovs-ofctl -F option and NXM features" "           " 21
 at_xfail=no
 (
-  $as_echo "357. $at_setup_line: testing $at_desc ..."
+  $as_echo "358. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/ovs-ofctl.at:2468: ovs-ofctl -F openflow10 add-flow dummy tun_id=123,actions=drop"
 at_fn_check_prepare_trace "ovs-ofctl.at:2468"
 ( $at_check_trace; ovs-ofctl -F openflow10 add-flow dummy tun_id=123,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: none of the usable flow formats (NXM,OXM) is among the allowed flow formats (OpenFlow10)
@@ -41996,7 +42024,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2471: ovs-ofctl -F openflow10 add-flow dummy metadata=123,actions=drop"
 at_fn_check_prepare_trace "ovs-ofctl.at:2471"
 ( $at_check_trace; ovs-ofctl -F openflow10 add-flow dummy metadata=123,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: none of the usable flow formats (NXM,OXM,OpenFlow11) is among the allowed flow formats (OpenFlow10)
@@ -42011,13 +42039,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_357
-#AT_START_358
-at_fn_group_banner 358 'ovs-ofctl.at:2480' \
+#AT_STOP_358
+#AT_START_359
+at_fn_group_banner 359 'ovs-ofctl.at:2480' \
   "ovs-ofctl -F option with flow_mods" "             " 21
 at_xfail=no
 (
-  $as_echo "358. $at_setup_line: testing $at_desc ..."
+  $as_echo "359. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -42030,7 +42058,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2481: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2481"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42044,7 +42072,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2481: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2481"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -42066,7 +42094,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42081,7 +42109,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2481: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-ofctl.at:2481"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42096,7 +42124,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2481: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-ofctl.at:2481"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -42128,7 +42156,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42145,7 +42173,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2481: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-ofctl.at:2481"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42161,7 +42189,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2482: ovs-ofctl -F nxm add-flow br0 tun_id=0x12345678,actions=drop"
 at_fn_check_prepare_trace "ovs-ofctl.at:2482"
 ( $at_check_trace; ovs-ofctl -F nxm add-flow br0 tun_id=0x12345678,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42176,7 +42204,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2483: ovs-ofctl dump-flows br0 | ofctl_strip"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2483"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42194,7 +42222,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2487: check_logs "
 at_fn_check_prepare_trace "ovs-ofctl.at:2487"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42209,7 +42237,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2487: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2487"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42224,7 +42252,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2487: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2487"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42239,13 +42267,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_358
-#AT_START_359
-at_fn_group_banner 359 'ovs-ofctl.at:2492' \
+#AT_STOP_359
+#AT_START_360
+at_fn_group_banner 360 'ovs-ofctl.at:2492' \
   "ovs-ofctl dump-flows honors -F option" "          " 21
 at_xfail=no
 (
-  $as_echo "359. $at_setup_line: testing $at_desc ..."
+  $as_echo "360. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -42258,7 +42286,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2493: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2493"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42272,7 +42300,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2493: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2493"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -42294,7 +42322,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42309,7 +42337,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2493: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-ofctl.at:2493"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42324,7 +42352,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2493: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-ofctl.at:2493"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -42356,7 +42384,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42373,7 +42401,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2493: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-ofctl.at:2493"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42389,7 +42417,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2494: ovs-ofctl add-flow br0 reg0=0x12345,actions=drop"
 at_fn_check_prepare_trace "ovs-ofctl.at:2494"
 ( $at_check_trace; ovs-ofctl add-flow br0 reg0=0x12345,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42404,7 +42432,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2495: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2495"
 ( $at_check_trace; ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42422,7 +42450,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2499: check_logs "
 at_fn_check_prepare_trace "ovs-ofctl.at:2499"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42437,7 +42465,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2499: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2499"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42452,7 +42480,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2499: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2499"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42467,13 +42495,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_359
-#AT_START_360
-at_fn_group_banner 360 'ovs-ofctl.at:2504' \
+#AT_STOP_360
+#AT_START_361
+at_fn_group_banner 361 'ovs-ofctl.at:2504' \
   "ovs-ofctl dump-flows rejects bad -F option" "     " 21
 at_xfail=no
 (
-  $as_echo "360. $at_setup_line: testing $at_desc ..."
+  $as_echo "361. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -42486,7 +42514,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2505: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2505"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42500,7 +42528,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2505: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2505"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -42522,7 +42550,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42537,7 +42565,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2505: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-ofctl.at:2505"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42552,7 +42580,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2505: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-ofctl.at:2505"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -42584,7 +42612,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42601,7 +42629,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2505: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-ofctl.at:2505"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42617,7 +42645,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2506: ovs-ofctl -F openflow10 dump-flows unix:br0.mgmt reg0=0xabcdef"
 at_fn_check_prepare_trace "ovs-ofctl.at:2506"
 ( $at_check_trace; ovs-ofctl -F openflow10 dump-flows unix:br0.mgmt reg0=0xabcdef
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: none of the usable flow formats (NXM,OXM) is among the allowed flow formats (OpenFlow10)
@@ -42634,7 +42662,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2509: check_logs "
 at_fn_check_prepare_trace "ovs-ofctl.at:2509"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42649,7 +42677,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2509: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2509"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42664,7 +42692,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2509: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2509"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42679,13 +42707,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_360
-#AT_START_361
-at_fn_group_banner 361 'ovs-ofctl.at:2513' \
+#AT_STOP_361
+#AT_START_362
+at_fn_group_banner 362 'ovs-ofctl.at:2513' \
   "ovs-ofctl add-flow reports non-normalized flows" "" 21
 at_xfail=no
 (
-  $as_echo "361. $at_setup_line: testing $at_desc ..."
+  $as_echo "362. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -42698,7 +42726,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2514: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2514"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42712,7 +42740,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2514: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2514"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -42734,7 +42762,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42749,7 +42777,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2514: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-ofctl.at:2514"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42764,7 +42792,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2514: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-ofctl.at:2514"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -42796,7 +42824,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42813,7 +42841,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2514: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-ofctl.at:2514"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42829,7 +42857,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2515: ovs-ofctl -vPATTERN:ANY:'%c|%p|%m' add-flow br0 nw_src=1.2.3.4,actions=5"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2515"
 ( $at_check_trace; ovs-ofctl -vPATTERN:ANY:'%c|%p|%m' add-flow br0 nw_src=1.2.3.4,actions=5
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ofp_util|INFO|normalization changed ofp_match, details:
@@ -42848,7 +42876,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2521: check_logs "
 at_fn_check_prepare_trace "ovs-ofctl.at:2521"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42863,7 +42891,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2521: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2521"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42878,7 +42906,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2521: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2521"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42893,13 +42921,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_361
-#AT_START_362
-at_fn_group_banner 362 'ovs-ofctl.at:2527' \
+#AT_STOP_362
+#AT_START_363
+at_fn_group_banner 363 'ovs-ofctl.at:2527' \
   "ovs-ofctl dump-flows with sorting" "              " 21
 at_xfail=no
 (
-  $as_echo "362. $at_setup_line: testing $at_desc ..."
+  $as_echo "363. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -42912,7 +42940,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2528: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2528"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42926,7 +42954,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2528: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2528"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -42948,7 +42976,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42963,7 +42991,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2528: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-ofctl.at:2528"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -42978,7 +43006,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2528: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-ofctl.at:2528"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -43010,7 +43038,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43027,7 +43055,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2528: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-ofctl.at:2528"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43060,7 +43088,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2542"
 ( $at_check_trace; ovs-ofctl add-flows br0 allflows.txt
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43075,7 +43103,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2544: ovs-ofctl --sort dump-flows br0 | ofctl_strip"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2544"
 ( $at_check_trace; ovs-ofctl --sort dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43100,7 +43128,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2555: ovs-ofctl --rsort dump-flows br0 | ofctl_strip"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2555"
 ( $at_check_trace; ovs-ofctl --rsort dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43125,7 +43153,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2566: ovs-ofctl --sort=in_port dump-flows br0 | ofctl_strip"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2566"
 ( $at_check_trace; ovs-ofctl --sort=in_port dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43150,7 +43178,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2577: ovs-ofctl --rsort=in_port dump-flows br0 | ofctl_strip"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2577"
 ( $at_check_trace; ovs-ofctl --rsort=in_port dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43175,7 +43203,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2588: ovs-ofctl --sort=tcp_src dump-flows br0 | ofctl_strip"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2588"
 ( $at_check_trace; ovs-ofctl --sort=tcp_src dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43200,7 +43228,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2599: ovs-ofctl --sort=in_port --sort=tcp_src dump-flows br0 | ofctl_strip"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2599"
 ( $at_check_trace; ovs-ofctl --sort=in_port --sort=tcp_src dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43225,7 +43253,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2611: check_logs "
 at_fn_check_prepare_trace "ovs-ofctl.at:2611"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43240,7 +43268,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2611: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2611"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43255,7 +43283,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2611: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2611"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43270,13 +43298,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_362
-#AT_START_363
-at_fn_group_banner 363 'ovs-ofctl.at:2614' \
+#AT_STOP_363
+#AT_START_364
+at_fn_group_banner 364 'ovs-ofctl.at:2614' \
   "ovs-ofctl diff-flows" "                           " 21
 at_xfail=no
 (
-  $as_echo "363. $at_setup_line: testing $at_desc ..."
+  $as_echo "364. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -43289,7 +43317,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2615: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2615"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43303,7 +43331,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2615: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2615"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -43325,7 +43353,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43340,7 +43368,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2615: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-ofctl.at:2615"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43355,7 +43383,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2615: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-ofctl.at:2615"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -43387,7 +43415,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43404,7 +43432,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2615: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-ofctl.at:2615"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43423,7 +43451,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2619: ovs-ofctl add-flows br0 add-flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2619"
 ( $at_check_trace; ovs-ofctl add-flows br0 add-flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43441,7 +43469,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2623: ovs-ofctl dump-flows br0 | ofctl_strip | sed '/NXST_FLOW/d' | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2623"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sed '/NXST_FLOW/d' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43456,7 +43484,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2625: ovs-ofctl diff-flows br0 add-flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2625"
 ( $at_check_trace; ovs-ofctl diff-flows br0 add-flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43474,7 +43502,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2629: ovs-ofctl del-flows br0 - < del-flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2629"
 ( $at_check_trace; ovs-ofctl del-flows br0 - < del-flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43490,7 +43518,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2631: ovs-ofctl diff-flows br0 add-flows.txt | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2631"
 ( $at_check_trace; ovs-ofctl diff-flows br0 add-flows.txt | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43506,7 +43534,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2633: ovs-ofctl diff-flows add-flows.txt br0 | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2633"
 ( $at_check_trace; ovs-ofctl diff-flows add-flows.txt br0 | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43522,7 +43550,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2635: check_logs "
 at_fn_check_prepare_trace "ovs-ofctl.at:2635"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43537,7 +43565,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2635: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2635"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43552,7 +43580,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2635: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2635"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43567,13 +43595,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_363
-#AT_START_364
-at_fn_group_banner 364 'ovs-ofctl.at:2646' \
+#AT_STOP_364
+#AT_START_365
+at_fn_group_banner 365 'ovs-ofctl.at:2646' \
   "ovs-ofctl diff-flows - suppress false differences" "" 21
 at_xfail=no
 (
-  $as_echo "364. $at_setup_line: testing $at_desc ..."
+  $as_echo "365. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -43586,7 +43614,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2647: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2647"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43600,7 +43628,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2647: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2647"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -43622,7 +43650,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43637,7 +43665,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2647: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-ofctl.at:2647"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43652,7 +43680,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2647: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-ofctl.at:2647"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -43684,7 +43712,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43701,7 +43729,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2647: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-ofctl.at:2647"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43721,7 +43749,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2650: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2650"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43736,7 +43764,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2651: ovs-ofctl diff-flows br0 flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2651"
 ( $at_check_trace; ovs-ofctl diff-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43751,7 +43779,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2652: ovs-ofctl add-flow br0 idle_timeout=60,dl_vlan=9,actions=output:1"
 at_fn_check_prepare_trace "ovs-ofctl.at:2652"
 ( $at_check_trace; ovs-ofctl add-flow br0 idle_timeout=60,dl_vlan=9,actions=output:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43766,7 +43794,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2653: ovs-ofctl diff-flows br0 flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2653"
 ( $at_check_trace; ovs-ofctl diff-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43783,7 +43811,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2656: ovs-ofctl add-flow br0 hard_timeout=120,cookie=1234,dl_vlan=9,actions=output:1"
 at_fn_check_prepare_trace "ovs-ofctl.at:2656"
 ( $at_check_trace; ovs-ofctl add-flow br0 hard_timeout=120,cookie=1234,dl_vlan=9,actions=output:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43798,7 +43826,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2657: ovs-ofctl diff-flows flows.txt br0"
 at_fn_check_prepare_trace "ovs-ofctl.at:2657"
 ( $at_check_trace; ovs-ofctl diff-flows flows.txt br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43815,7 +43843,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2660: check_logs "
 at_fn_check_prepare_trace "ovs-ofctl.at:2660"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43830,7 +43858,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2660: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2660"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43845,7 +43873,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2660: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2660"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43860,20 +43888,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_364
-#AT_START_365
-at_fn_group_banner 365 'ovs-ofctl.at:2663' \
+#AT_STOP_365
+#AT_START_366
+at_fn_group_banner 366 'ovs-ofctl.at:2663' \
   "ovs-ofctl -F and -O interaction" "                " 21
 at_xfail=no
 (
-  $as_echo "365. $at_setup_line: testing $at_desc ..."
+  $as_echo "366. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/ovs-ofctl.at:2664: ovs-ofctl -F oxm -O openflow10"
 at_fn_check_prepare_trace "ovs-ofctl.at:2664"
 ( $at_check_trace; ovs-ofctl -F oxm -O openflow10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: None of the enabled OpenFlow versions (OpenFlow10) supports any of the enabled flow formats (OXM).  (Use -O to enable additional OpenFlow versions or -F to enable additional flow formats.)
@@ -43888,7 +43916,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2667: ovs-ofctl -F oxm -O openflow11"
 at_fn_check_prepare_trace "ovs-ofctl.at:2667"
 ( $at_check_trace; ovs-ofctl -F oxm -O openflow11
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: None of the enabled OpenFlow versions (OpenFlow11) supports any of the enabled flow formats (OXM).  (Use -O to enable additional OpenFlow versions or -F to enable additional flow formats.)
@@ -43903,7 +43931,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2670: ovs-ofctl -F oxm -O openflow10,openflow11"
 at_fn_check_prepare_trace "ovs-ofctl.at:2670"
 ( $at_check_trace; ovs-ofctl -F oxm -O openflow10,openflow11
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: None of the enabled OpenFlow versions (OpenFlow10, OpenFlow11) supports any of the enabled flow formats (OXM).  (Use -O to enable additional OpenFlow versions or -F to enable additional flow formats.)
@@ -43918,7 +43946,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2673: ovs-ofctl -F oxm -O openflow10,openflow12"
 at_fn_check_prepare_trace "ovs-ofctl.at:2673"
 ( $at_check_trace; ovs-ofctl -F oxm -O openflow10,openflow12
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: missing command name; use --help for help
@@ -43933,7 +43961,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2676: ovs-ofctl -F oxm -O openflow12"
 at_fn_check_prepare_trace "ovs-ofctl.at:2676"
 ( $at_check_trace; ovs-ofctl -F oxm -O openflow12
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: missing command name; use --help for help
@@ -43948,7 +43976,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2679: ovs-ofctl -F oxm -O openflow13"
 at_fn_check_prepare_trace "ovs-ofctl.at:2679"
 ( $at_check_trace; ovs-ofctl -F oxm -O openflow13
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: missing command name; use --help for help
@@ -43963,13 +43991,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_365
-#AT_START_366
-at_fn_group_banner 366 'ovs-ofctl.at:2684' \
+#AT_STOP_366
+#AT_START_367
+at_fn_group_banner 367 'ovs-ofctl.at:2684' \
   "ovs-ofctl ofp-parse" "                            " 21
 at_xfail=no
 (
-  $as_echo "366. $at_setup_line: testing $at_desc ..."
+  $as_echo "367. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # Test the echo request/reply messages (0 payload).
@@ -43977,7 +44005,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2686: printf '\\1\\2\\0\\10\\0\\0\\0\\0\\1\\3\\0\\10\\0\\0\\0\\0' > binary_ofp_msg"
 at_fn_check_prepare_trace "ovs-ofctl.at:2686"
 ( $at_check_trace; printf '\1\2\0\10\0\0\0\0\1\3\0\10\0\0\0\0' > binary_ofp_msg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -43990,7 +44018,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2687: ovs-ofctl ofp-parse binary_ofp_msg"
 at_fn_check_prepare_trace "ovs-ofctl.at:2687"
 ( $at_check_trace; ovs-ofctl ofp-parse binary_ofp_msg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44008,7 +44036,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2693: printf '\\1\\0\\0\\13\\0\\0\\0\\1\\101\\102\\103' > binary_ofp_msg"
 at_fn_check_prepare_trace "ovs-ofctl.at:2693"
 ( $at_check_trace; printf '\1\0\0\13\0\0\0\1\101\102\103' > binary_ofp_msg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44021,7 +44049,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2694: ovs-ofctl ofp-parse - < binary_ofp_msg"
 at_fn_check_prepare_trace "ovs-ofctl.at:2694"
 ( $at_check_trace; ovs-ofctl ofp-parse - < binary_ofp_msg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44039,13 +44067,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_366
-#AT_START_367
-at_fn_group_banner 367 'ovs-ofctl.at:2702' \
+#AT_STOP_367
+#AT_START_368
+at_fn_group_banner 368 'ovs-ofctl.at:2702' \
   "tcp flags - filtering" "                          " 21
 at_xfail=no
 (
-  $as_echo "367. $at_setup_line: testing $at_desc ..."
+  $as_echo "368. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -44058,7 +44086,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2703: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2703"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44072,7 +44100,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2703: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2703"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -44094,7 +44122,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44109,7 +44137,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2703: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-ofctl.at:2703"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44124,7 +44152,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2703: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-ofctl.at:2703"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -44156,7 +44184,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44175,7 +44203,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2703"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
                     -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44202,7 +44230,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2715: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2715"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44218,7 +44246,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2717: ovs-ofctl add-flow br0 \"tcp,tcp_flags=+ack-ack,action=\""
 at_fn_check_prepare_trace "ovs-ofctl.at:2717"
 ( $at_check_trace; ovs-ofctl add-flow br0 "tcp,tcp_flags=+ack-ack,action="
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: ack: Each TCP flag can be specified only once
@@ -44236,7 +44264,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2721: ovs-appctl dpif/show | tail -n +4"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2721"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44255,7 +44283,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2727: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x002)'"
 at_fn_check_prepare_trace "ovs-ofctl.at:2727"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x002)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44270,7 +44298,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2728: tail -1 stdout"
 at_fn_check_prepare_trace "ovs-ofctl.at:2728"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44288,7 +44316,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2733: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x110)'"
 at_fn_check_prepare_trace "ovs-ofctl.at:2733"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x110)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44303,7 +44331,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2734: tail -1 stdout"
 at_fn_check_prepare_trace "ovs-ofctl.at:2734"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44321,7 +44349,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2739: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x104)'"
 at_fn_check_prepare_trace "ovs-ofctl.at:2739"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x104)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44336,7 +44364,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2740: tail -1 stdout"
 at_fn_check_prepare_trace "ovs-ofctl.at:2740"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44354,7 +44382,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2745: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0x010)'"
 at_fn_check_prepare_trace "ovs-ofctl.at:2745"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0x010)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44369,7 +44397,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2746: tail -1 stdout"
 at_fn_check_prepare_trace "ovs-ofctl.at:2746"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44387,7 +44415,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2751: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0x014)'"
 at_fn_check_prepare_trace "ovs-ofctl.at:2751"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0x014)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44402,7 +44430,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2752: tail -1 stdout"
 at_fn_check_prepare_trace "ovs-ofctl.at:2752"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44420,7 +44448,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2757: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0xfeb)'"
 at_fn_check_prepare_trace "ovs-ofctl.at:2757"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0xfeb)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44435,7 +44463,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2758: tail -1 stdout"
 at_fn_check_prepare_trace "ovs-ofctl.at:2758"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44453,7 +44481,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2762: check_logs "
 at_fn_check_prepare_trace "ovs-ofctl.at:2762"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44468,7 +44496,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2762: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2762"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44483,7 +44511,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2762: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2762"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44498,13 +44526,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_367
-#AT_START_368
-at_fn_group_banner 368 'ovs-ofctl.at:2771' \
+#AT_STOP_368
+#AT_START_369
+at_fn_group_banner 369 'ovs-ofctl.at:2771' \
   "ovs-ofctl rule with importance" "                 " 21
 at_xfail=no
 (
-  $as_echo "368. $at_setup_line: testing $at_desc ..."
+  $as_echo "369. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -44517,7 +44545,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2772: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2772"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44531,7 +44559,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2772: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2772"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -44553,7 +44581,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44568,7 +44596,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2772: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-ofctl.at:2772"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44583,7 +44611,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2772: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-ofctl.at:2772"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -44615,7 +44643,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44632,7 +44660,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2772: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-ofctl.at:2772"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44648,7 +44676,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2774: ovs-ofctl -O OpenFlow14 add-flow br0 priority=21,importance=21,actions=normal"
 at_fn_check_prepare_trace "ovs-ofctl.at:2774"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 add-flow br0 priority=21,importance=21,actions=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44663,7 +44691,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2775: ovs-ofctl add-flow br0 priority=22,importance=22,actions=normal"
 at_fn_check_prepare_trace "ovs-ofctl.at:2775"
 ( $at_check_trace; ovs-ofctl add-flow br0 priority=22,importance=22,actions=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44679,7 +44707,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2778: ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/ST_FLOW reply/d' | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2778"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/ST_FLOW reply/d' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44698,7 +44726,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2784: ovs-ofctl dump-flows br0 | ofctl_strip | sed '/ST_FLOW reply/d' | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2784"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sed '/ST_FLOW reply/d' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44717,7 +44745,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2789: check_logs "
 at_fn_check_prepare_trace "ovs-ofctl.at:2789"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44732,7 +44760,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2789: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2789"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44747,7 +44775,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2789: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2789"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44762,13 +44790,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_368
-#AT_START_369
-at_fn_group_banner 369 'ovs-ofctl.at:2798' \
+#AT_STOP_369
+#AT_START_370
+at_fn_group_banner 370 'ovs-ofctl.at:2798' \
   "ovs-ofctl replace-flows with importance" "        " 21
 at_xfail=no
 (
-  $as_echo "369. $at_setup_line: testing $at_desc ..."
+  $as_echo "370. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -44781,7 +44809,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2799: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2799"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44795,7 +44823,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2799: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2799"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -44817,7 +44845,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44832,7 +44860,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2799: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-ofctl.at:2799"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44847,7 +44875,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2799: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-ofctl.at:2799"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -44879,7 +44907,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44896,7 +44924,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2799: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-ofctl.at:2799"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44914,7 +44942,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2803: ovs-ofctl -O OpenFlow14 add-flows br0 add-flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2803"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 add-flows br0 add-flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44931,7 +44959,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2807: ovs-ofctl -O OpenFlow14 replace-flows br0 replace-flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2807"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 replace-flows br0 replace-flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44948,7 +44976,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2811: ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/OFPST_FLOW/d' | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2811"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/OFPST_FLOW/d' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44964,7 +44992,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2814: check_logs "
 at_fn_check_prepare_trace "ovs-ofctl.at:2814"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44979,7 +45007,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2814: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2814"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -44994,7 +45022,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2814: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2814"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45009,13 +45037,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_369
-#AT_START_370
-at_fn_group_banner 370 'ovs-ofctl.at:2817' \
+#AT_STOP_370
+#AT_START_371
+at_fn_group_banner 371 'ovs-ofctl.at:2817' \
   "ovs-ofctl replace-flows with --bundle" "          " 21
 at_xfail=no
 (
-  $as_echo "370. $at_setup_line: testing $at_desc ..."
+  $as_echo "371. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -45028,7 +45056,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2818: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2818"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45042,7 +45070,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2818: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2818"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -45064,7 +45092,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45079,7 +45107,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2818: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-ofctl.at:2818"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45094,7 +45122,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2818: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-ofctl.at:2818"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -45126,7 +45154,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45143,7 +45171,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2818: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-ofctl.at:2818"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45160,7 +45188,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2820: ovs-appctl vlog/set vconn:dbg"
 at_fn_check_prepare_trace "ovs-ofctl.at:2820"
 ( $at_check_trace; ovs-appctl vlog/set vconn:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45177,7 +45205,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2824: ovs-ofctl --bundle add-flows br0 add-flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2824"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 add-flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45194,7 +45222,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2828: ovs-ofctl --bundle replace-flows br0 replace-flows.txt"
 at_fn_check_prepare_trace "ovs-ofctl.at:2828"
 ( $at_check_trace; ovs-ofctl --bundle replace-flows br0 replace-flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45211,7 +45239,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2832: ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/OFPST_FLOW/d' | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2832"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/OFPST_FLOW/d' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45232,7 +45260,7 @@
 ( $at_check_trace; ovs_wait_cond () { cat ovs-vswitchd.log | vconn_windows_sub | test `grep -- "|vconn|DBG|unix: sent (Success): OFPST_FLOW reply" | wc -l` -ge 2
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -45248,7 +45276,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2839: print_vconn_debug | vconn_windows_sub | ofctl_strip"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2839"
 ( $at_check_trace; print_vconn_debug | vconn_windows_sub | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45344,7 +45372,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2921: check_logs "
 at_fn_check_prepare_trace "ovs-ofctl.at:2921"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45359,7 +45387,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2921: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2921"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45374,7 +45402,7 @@
 $as_echo "$at_srcdir/ovs-ofctl.at:2921: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-ofctl.at:2921"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45389,13 +45417,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_370
-#AT_START_371
-at_fn_group_banner 371 'odp.at:3' \
+#AT_STOP_371
+#AT_START_372
+at_fn_group_banner 372 'odp.at:3' \
   "OVS datapath key parsing and formatting - valid forms" "" 22
 at_xfail=no
 (
-  $as_echo "371. $at_setup_line: testing $at_desc ..."
+  $as_echo "372. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >odp-base.txt <<'_ATEOF'
@@ -45484,7 +45512,7 @@
 $as_echo "$at_srcdir/odp.at:89: ovstest test-odp parse-keys < odp-in.txt"
 at_fn_check_prepare_trace "odp.at:89"
 ( $at_check_trace; ovstest test-odp parse-keys < odp-in.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45500,13 +45528,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_371
-#AT_START_372
-at_fn_group_banner 372 'odp.at:93' \
+#AT_STOP_372
+#AT_START_373
+at_fn_group_banner 373 'odp.at:93' \
   "OVS datapath wildcarded key parsing and formatting - valid forms" "" 22
 at_xfail=no
 (
-  $as_echo "372. $at_setup_line: testing $at_desc ..."
+  $as_echo "373. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >odp-base.txt <<'_ATEOF'
@@ -45582,7 +45610,7 @@
 $as_echo "$at_srcdir/odp.at:163: ovstest test-odp parse-wc-keys < odp.txt"
 at_fn_check_prepare_trace "odp.at:163"
 ( $at_check_trace; ovstest test-odp parse-wc-keys < odp.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45598,13 +45626,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_372
-#AT_START_373
-at_fn_group_banner 373 'odp.at:167' \
+#AT_STOP_373
+#AT_START_374
+at_fn_group_banner 374 'odp.at:167' \
   "OVS datapath wildcarded key filtering." "         " 22
 at_xfail=no
 (
-  $as_echo "373. $at_setup_line: testing $at_desc ..."
+  $as_echo "374. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >odp-base.txt <<'_ATEOF'
@@ -45661,7 +45689,7 @@
 $as_echo "$at_srcdir/odp.at:210: ovstest test-odp parse-filter filter='dl_type=0x1235' < odp-base.txt"
 at_fn_check_prepare_trace "odp.at:210"
 ( $at_check_trace; ovstest test-odp parse-filter filter='dl_type=0x1235' < odp-base.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45676,7 +45704,7 @@
 $as_echo "$at_srcdir/odp.at:212: ovstest test-odp parse-filter filter='dl_vlan=99' < odp-vlan-base.txt"
 at_fn_check_prepare_trace "odp.at:212"
 ( $at_check_trace; ovstest test-odp parse-filter filter='dl_vlan=99' < odp-vlan-base.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45691,7 +45719,7 @@
 $as_echo "$at_srcdir/odp.at:214: ovstest test-odp parse-filter filter='dl_vlan=99,ip' < odp-vlan-base.txt"
 at_fn_check_prepare_trace "odp.at:214"
 ( $at_check_trace; ovstest test-odp parse-filter filter='dl_vlan=99,ip' < odp-vlan-base.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45706,7 +45734,7 @@
 $as_echo "$at_srcdir/odp.at:216: ovstest test-odp parse-filter filter='ip,nw_src=35.8.2.199' < odp-base.txt"
 at_fn_check_prepare_trace "odp.at:216"
 ( $at_check_trace; ovstest test-odp parse-filter filter='ip,nw_src=35.8.2.199' < odp-base.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45721,7 +45749,7 @@
 $as_echo "$at_srcdir/odp.at:218: ovstest test-odp parse-filter filter='ip,nw_dst=172.16.0.199' < odp-base.txt"
 at_fn_check_prepare_trace "odp.at:218"
 ( $at_check_trace; ovstest test-odp parse-filter filter='ip,nw_dst=172.16.0.199' < odp-base.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45736,7 +45764,7 @@
 $as_echo "$at_srcdir/odp.at:220: ovstest test-odp parse-filter filter='dl_type=0x0800,nw_src=35.8.2.199,nw_dst=172.16.0.199' < odp-base.txt"
 at_fn_check_prepare_trace "odp.at:220"
 ( $at_check_trace; ovstest test-odp parse-filter filter='dl_type=0x0800,nw_src=35.8.2.199,nw_dst=172.16.0.199' < odp-base.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45751,7 +45779,7 @@
 $as_echo "$at_srcdir/odp.at:222: ovstest test-odp parse-filter filter='icmp,nw_src=35.8.2.199' < odp-base.txt"
 at_fn_check_prepare_trace "odp.at:222"
 ( $at_check_trace; ovstest test-odp parse-filter filter='icmp,nw_src=35.8.2.199' < odp-base.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45766,7 +45794,7 @@
 $as_echo "$at_srcdir/odp.at:224: ovstest test-odp parse-filter filter='arp,arp_spa=1.2.3.5' < odp-base.txt"
 at_fn_check_prepare_trace "odp.at:224"
 ( $at_check_trace; ovstest test-odp parse-filter filter='arp,arp_spa=1.2.3.5' < odp-base.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45781,7 +45809,7 @@
 $as_echo "$at_srcdir/odp.at:226: ovstest test-odp parse-filter filter='tcp,tp_src=90' < odp-base.txt"
 at_fn_check_prepare_trace "odp.at:226"
 ( $at_check_trace; ovstest test-odp parse-filter filter='tcp,tp_src=90' < odp-base.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45796,7 +45824,7 @@
 $as_echo "$at_srcdir/odp.at:228: ovstest test-odp parse-filter filter='tcp6,tp_src=90' < odp-base.txt"
 at_fn_check_prepare_trace "odp.at:228"
 ( $at_check_trace; ovstest test-odp parse-filter filter='tcp6,tp_src=90' < odp-base.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45811,13 +45839,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_373
-#AT_START_374
-at_fn_group_banner 374 'odp.at:232' \
+#AT_STOP_374
+#AT_START_375
+at_fn_group_banner 375 'odp.at:232' \
   "OVS datapath actions parsing and formatting - valid forms" "" 22
 at_xfail=no
 (
-  $as_echo "374. $at_setup_line: testing $at_desc ..."
+  $as_echo "375. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >actions.txt <<'_ATEOF'
@@ -45877,18 +45905,18 @@
 set(tunnel(tun_id=0xabcdef1234567890,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(df,csum,key)))
 set(tunnel(tun_id=0xabcdef1234567890,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)))
 tnl_pop(4)
-tnl_push(tnl_port(4),header(size=42,type=3,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=47,tos=0,ttl=64,frag=0x40),gre((flags=0x2000,proto=0x6558),key=0x1e241)),out_port(1))
-tnl_push(tnl_port(4),header(size=46,type=3,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=47,tos=0,ttl=64,frag=0x40),gre((flags=0xa000,proto=0x6558),csum=0x0,key=0x1e241)),out_port(1))
-tnl_push(tnl_port(6),header(size=50,type=4,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=4789,csum=0x0),vxlan(flags=0x8000000,vni=0x1c7)),out_port(1))
-tnl_push(tnl_port(6),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=6081,csum=0x0),geneve(oam,vni=0x1c7)),out_port(1))
-tnl_push(tnl_port(6),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=6081,csum=0xffff),geneve(vni=0x1c7)),out_port(1))
+tnl_push(tnl_port(4),header(size=42,type=3,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=47,tos=0,ttl=64,frag=0x4000),gre((flags=0x2000,proto=0x6558),key=0x1e241)),out_port(1))
+tnl_push(tnl_port(4),header(size=46,type=3,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=47,tos=0,ttl=64,frag=0x4000),gre((flags=0xa000,proto=0x6558),csum=0x0,key=0x1e241)),out_port(1))
+tnl_push(tnl_port(6),header(size=50,type=4,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=4789,csum=0x0),vxlan(flags=0x8000000,vni=0x1c7)),out_port(1))
+tnl_push(tnl_port(6),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=6081,csum=0x0),geneve(oam,vni=0x1c7)),out_port(1))
+tnl_push(tnl_port(6),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=f8:bc:12:46:58:e0,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=6081,csum=0xffff),geneve(vni=0x1c7)),out_port(1))
 _ATEOF
 
 { set +x
 $as_echo "$at_srcdir/odp.at:296: ovstest test-odp parse-actions < actions.txt"
 at_fn_check_prepare_trace "odp.at:296"
 ( $at_check_trace; ovstest test-odp parse-actions < actions.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45903,13 +45931,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_374
-#AT_START_375
-at_fn_group_banner 375 'mpls-xlate.at:3' \
+#AT_STOP_375
+#AT_START_376
+at_fn_group_banner 376 'mpls-xlate.at:3' \
   "MPLS xlate action" "                              " 23
 at_xfail=no
 (
-  $as_echo "375. $at_setup_line: testing $at_desc ..."
+  $as_echo "376. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -45923,7 +45951,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:5: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "mpls-xlate.at:5"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45937,7 +45965,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:5: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "mpls-xlate.at:5"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -45959,7 +45987,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45974,7 +46002,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:5: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "mpls-xlate.at:5"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -45989,7 +46017,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:5: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "mpls-xlate.at:5"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -46021,7 +46049,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46038,7 +46066,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:5: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 "
 at_fn_check_prepare_trace "mpls-xlate.at:5"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46055,7 +46083,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:7: ovs-appctl dpif/show"
 at_fn_check_prepare_trace "mpls-xlate.at:7"
 ( $at_check_trace; ovs-appctl dpif/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46076,7 +46104,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:15: ovs-ofctl -O OpenFlow13 add-flow br0 in_port=local,dl_type=0x0800,action=push_mpls:0x8847,set_field:10-\\>mpls_label,output:1"
 at_fn_check_prepare_trace "mpls-xlate.at:15"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 add-flow br0 in_port=local,dl_type=0x0800,action=push_mpls:0x8847,set_field:10-\>mpls_label,output:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46091,7 +46119,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:16: ovs-ofctl -O OpenFlow13 add-flow br0 dl_type=0x8847,in_port=1,mpls_label=20,action=pop_mpls:0x0800,output:LOCAL"
 at_fn_check_prepare_trace "mpls-xlate.at:16"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 add-flow br0 dl_type=0x8847,in_port=1,mpls_label=20,action=pop_mpls:0x0800,output:LOCAL
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46107,7 +46135,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:19: ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=47,tos=0,ttl=64,frag=no)'"
 at_fn_check_prepare_trace "mpls-xlate.at:19"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=47,tos=0,ttl=64,frag=no)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46122,7 +46150,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:20: tail -1 stdout"
 at_fn_check_prepare_trace "mpls-xlate.at:20"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46140,7 +46168,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:25: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x8847),mpls(label=20,tc=0,ttl=64,bos=1)'"
 at_fn_check_prepare_trace "mpls-xlate.at:25"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x8847),mpls(label=20,tc=0,ttl=64,bos=1)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46155,7 +46183,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:26: tail -1 stdout"
 at_fn_check_prepare_trace "mpls-xlate.at:26"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46173,7 +46201,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:31: ovs-ofctl del-flows br0"
 at_fn_check_prepare_trace "mpls-xlate.at:31"
 ( $at_check_trace; ovs-ofctl del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46189,7 +46217,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:33: ovs-ofctl -O OpenFlow13 add-flow br0 in_port=local,dl_type=0x0800,action=push_mpls:0x8847,set_field:10-\\>mpls_label,push_mpls:0x8847,set_field:20-\\>mpls_label,output:1"
 at_fn_check_prepare_trace "mpls-xlate.at:33"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 add-flow br0 in_port=local,dl_type=0x0800,action=push_mpls:0x8847,set_field:10-\>mpls_label,push_mpls:0x8847,set_field:20-\>mpls_label,output:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46206,7 +46234,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:36: ovs-ofctl -O OpenFlow13 add-flow br0 cookie=0xa,table=0,dl_type=0x8847,in_port=1,mpls_label=60,action=set_field:10-\\>reg0,pop_mpls:0x8847,goto_table:1"
 at_fn_check_prepare_trace "mpls-xlate.at:36"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 add-flow br0 cookie=0xa,table=0,dl_type=0x8847,in_port=1,mpls_label=60,action=set_field:10-\>reg0,pop_mpls:0x8847,goto_table:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46223,7 +46251,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:39: ovs-ofctl -O OpenFlow13 add-flow br0 cookie=0xb,table=1,dl_type=0x8847,in_port=1,mpls_label=50,action=push:NXM_NX_REG0[0..7],pop_mpls:0x0800,set_field:0-\\>nw_ttl,pop:NXM_NX_REG1[0..7],move:NXM_NX_REG1[0..7]-\\>NXM_NX_IP_TTL[],output:LOCAL"
 at_fn_check_prepare_trace "mpls-xlate.at:39"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 add-flow br0 cookie=0xb,table=1,dl_type=0x8847,in_port=1,mpls_label=50,action=push:NXM_NX_REG0[0..7],pop_mpls:0x0800,set_field:0-\>nw_ttl,pop:NXM_NX_REG1[0..7],move:NXM_NX_REG1[0..7]-\>NXM_NX_IP_TTL[],output:LOCAL
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46239,7 +46267,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:42: ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=47,tos=0,ttl=64,frag=no)'"
 at_fn_check_prepare_trace "mpls-xlate.at:42"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=47,tos=0,ttl=64,frag=no)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46254,7 +46282,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:43: tail -1 stdout"
 at_fn_check_prepare_trace "mpls-xlate.at:43"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46272,7 +46300,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:48: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x8847),mpls(label=60,tc=0/0,ttl=64,bos=0)' -generate"
 at_fn_check_prepare_trace "mpls-xlate.at:48"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x8847),mpls(label=60,tc=0/0,ttl=64,bos=0)' -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46287,7 +46315,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:49: tail -1 stdout"
 at_fn_check_prepare_trace "mpls-xlate.at:49"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46305,7 +46333,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:53: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(1),in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x8847),mpls(label=50,tc=0/0,ttl=64,bos=0)' -generate"
 at_fn_check_prepare_trace "mpls-xlate.at:53"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(1),in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x8847),mpls(label=50,tc=0/0,ttl=64,bos=0)' -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46320,7 +46348,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:54: tail -1 stdout"
 at_fn_check_prepare_trace "mpls-xlate.at:54"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46338,7 +46366,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:58: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(2),in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=47,tos=0,ttl=64,frag=no)' -generate"
 at_fn_check_prepare_trace "mpls-xlate.at:58"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(2),in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=47,tos=0,ttl=64,frag=no)' -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46353,7 +46381,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:59: tail -1 stdout"
 at_fn_check_prepare_trace "mpls-xlate.at:59"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46371,7 +46399,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:63: check_logs "
 at_fn_check_prepare_trace "mpls-xlate.at:63"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46386,7 +46414,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:63: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "mpls-xlate.at:63"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46401,7 +46429,7 @@
 $as_echo "$at_srcdir/mpls-xlate.at:63: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "mpls-xlate.at:63"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46416,20 +46444,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_375
-#AT_START_376
-at_fn_group_banner 376 'multipath.at:10' \
+#AT_STOP_376
+#AT_START_377
+at_fn_group_banner 377 'multipath.at:10' \
   "modulo_n multipath link selection" "              " 24
 at_xfail=no
 (
-  $as_echo "376. $at_setup_line: testing $at_desc ..."
+  $as_echo "377. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/multipath.at:11: ovstest test-multipath 'eth_src,50,modulo_n,1,0,NXM_NX_REG0[]'"
 at_fn_check_prepare_trace "multipath.at:11"
 ( $at_check_trace; ovstest test-multipath 'eth_src,50,modulo_n,1,0,NXM_NX_REG0[]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46505,20 +46533,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_376
-#AT_START_377
-at_fn_group_banner 377 'multipath.at:78' \
+#AT_STOP_377
+#AT_START_378
+at_fn_group_banner 378 'multipath.at:78' \
   "hash_threshold multipath link selection" "        " 24
 at_xfail=no
 (
-  $as_echo "377. $at_setup_line: testing $at_desc ..."
+  $as_echo "378. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/multipath.at:79: ovstest test-multipath 'eth_src,50,hash_threshold,1,0,NXM_NX_REG0[]'"
 at_fn_check_prepare_trace "multipath.at:79"
 ( $at_check_trace; ovstest test-multipath 'eth_src,50,hash_threshold,1,0,NXM_NX_REG0[]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46594,20 +46622,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_377
-#AT_START_378
-at_fn_group_banner 378 'multipath.at:146' \
+#AT_STOP_378
+#AT_START_379
+at_fn_group_banner 379 'multipath.at:146' \
   "hrw multipath link selection" "                   " 24
 at_xfail=no
 (
-  $as_echo "378. $at_setup_line: testing $at_desc ..."
+  $as_echo "379. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/multipath.at:147: ovstest test-multipath 'eth_src,50,hrw,1,0,NXM_NX_REG0[]'"
 at_fn_check_prepare_trace "multipath.at:147"
 ( $at_check_trace; ovstest test-multipath 'eth_src,50,hrw,1,0,NXM_NX_REG0[]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46683,20 +46711,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_378
-#AT_START_379
-at_fn_group_banner 379 'multipath.at:214' \
+#AT_STOP_379
+#AT_START_380
+at_fn_group_banner 380 'multipath.at:214' \
   "iter_hash multipath link selection" "             " 24
 at_xfail=no
 (
-  $as_echo "379. $at_setup_line: testing $at_desc ..."
+  $as_echo "380. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/multipath.at:215: ovstest test-multipath 'eth_src,50,iter_hash,1,0,NXM_NX_REG0[]'"
 at_fn_check_prepare_trace "multipath.at:215"
 ( $at_check_trace; ovstest test-multipath 'eth_src,50,iter_hash,1,0,NXM_NX_REG0[]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46772,20 +46800,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_379
-#AT_START_380
-at_fn_group_banner 380 'multipath.at:282' \
+#AT_STOP_380
+#AT_START_381
+at_fn_group_banner 381 'multipath.at:282' \
   "multipath action missing argument" "              " 24
 at_xfail=no
 (
-  $as_echo "380. $at_setup_line: testing $at_desc ..."
+  $as_echo "381. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/multipath.at:283: ovs-ofctl parse-flow actions=multipath"
 at_fn_check_prepare_trace "multipath.at:283"
 ( $at_check_trace; ovs-ofctl parse-flow actions=multipath
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: : not enough arguments to multipath action
@@ -46800,20 +46828,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_380
-#AT_START_381
-at_fn_group_banner 381 'multipath.at:288' \
+#AT_STOP_381
+#AT_START_382
+at_fn_group_banner 382 'multipath.at:288' \
   "multipath action bad fields" "                    " 24
 at_xfail=no
 (
-  $as_echo "381. $at_setup_line: testing $at_desc ..."
+  $as_echo "382. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/multipath.at:289: ovs-ofctl parse-flow 'actions=multipath(xyzzy,50,modulo_n,1,0,NXM_NX_REG0[])'"
 at_fn_check_prepare_trace "multipath.at:289"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=multipath(xyzzy,50,modulo_n,1,0,NXM_NX_REG0[])'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: xyzzy,50,modulo_n,1,0,NXM_NX_REG0[]: unknown fields \`xyzzy'
@@ -46828,20 +46856,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_381
-#AT_START_382
-at_fn_group_banner 382 'multipath.at:294' \
+#AT_STOP_382
+#AT_START_383
+at_fn_group_banner 383 'multipath.at:294' \
   "multipath action bad algorithm" "                 " 24
 at_xfail=no
 (
-  $as_echo "382. $at_setup_line: testing $at_desc ..."
+  $as_echo "383. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/multipath.at:295: ovs-ofctl parse-flow 'actions=multipath(eth_src,50,fubar,1,0,NXM_NX_REG0[])'"
 at_fn_check_prepare_trace "multipath.at:295"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=multipath(eth_src,50,fubar,1,0,NXM_NX_REG0[])'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: eth_src,50,fubar,1,0,NXM_NX_REG0[]: unknown algorithm \`fubar'
@@ -46856,20 +46884,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_382
-#AT_START_383
-at_fn_group_banner 383 'multipath.at:300' \
+#AT_STOP_383
+#AT_START_384
+at_fn_group_banner 384 'multipath.at:300' \
   "multipath action bad n_links" "                   " 24
 at_xfail=no
 (
-  $as_echo "383. $at_setup_line: testing $at_desc ..."
+  $as_echo "384. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/multipath.at:301: ovs-ofctl parse-flow 'actions=multipath(eth_src,50,modulo_n,0,0,NXM_NX_REG0[])'"
 at_fn_check_prepare_trace "multipath.at:301"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=multipath(eth_src,50,modulo_n,0,0,NXM_NX_REG0[])'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: eth_src,50,modulo_n,0,0,NXM_NX_REG0[]: n_links 0 is not in valid range 1 to 65536
@@ -46884,20 +46912,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_383
-#AT_START_384
-at_fn_group_banner 384 'multipath.at:306' \
+#AT_STOP_384
+#AT_START_385
+at_fn_group_banner 385 'multipath.at:306' \
   "multipath action destination too narrow" "        " 24
 at_xfail=no
 (
-  $as_echo "384. $at_setup_line: testing $at_desc ..."
+  $as_echo "385. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/multipath.at:307: ovs-ofctl parse-flow 'actions=multipath(eth_src,50,modulo_n,1024,0,NXM_NX_REG0[0..7])'"
 at_fn_check_prepare_trace "multipath.at:307"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=multipath(eth_src,50,modulo_n,1024,0,NXM_NX_REG0[0..7])'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: eth_src,50,modulo_n,1024,0,NXM_NX_REG0[0..7]: 8-bit destination field has 256 possible values, less than specified n_links 1024
@@ -46912,13 +46940,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_384
-#AT_START_385
-at_fn_group_banner 385 'learn.at:3' \
+#AT_STOP_385
+#AT_START_386
+at_fn_group_banner 386 'learn.at:3' \
   "learning action - parsing and formatting" "       " 25
 at_xfail=no
 (
-  $as_echo "385. $at_setup_line: testing $at_desc ..."
+  $as_echo "386. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >flows.txt <<'_ATEOF'
@@ -46935,7 +46963,7 @@
 $as_echo "$at_srcdir/learn.at:12: ovs-ofctl parse-flows flows.txt"
 at_fn_check_prepare_trace "learn.at:12"
 ( $at_check_trace; ovs-ofctl parse-flows flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46957,20 +46985,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_385
-#AT_START_386
-at_fn_group_banner 386 'learn.at:24' \
+#AT_STOP_386
+#AT_START_387
+at_fn_group_banner 387 'learn.at:24' \
   "learning action - parsing and formatting - illegal in_port_oxm" "" 25
 at_xfail=no
 (
-  $as_echo "386. $at_setup_line: testing $at_desc ..."
+  $as_echo "387. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/learn.at:25: ovs-ofctl parse-flow 'actions=learn(table=1, in_port_oxm=123456)'"
 at_fn_check_prepare_trace "learn.at:25"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=learn(table=1, in_port_oxm=123456)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -46983,7 +47011,7 @@
 $as_echo "$at_srcdir/learn.at:27: sed -e 's/.*|ofp_util|WARN|//' < stderr"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:27"
 ( $at_check_trace; sed -e 's/.*|ofp_util|WARN|//' < stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -46999,13 +47027,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_386
-#AT_START_387
-at_fn_group_banner 387 'learn.at:33' \
+#AT_STOP_387
+#AT_START_388
+at_fn_group_banner 388 'learn.at:33' \
   "learning action - parsing and formatting - OXM" " " 25
 at_xfail=no
 (
-  $as_echo "387. $at_setup_line: testing $at_desc ..."
+  $as_echo "388. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >flows.txt <<'_ATEOF'
@@ -47018,7 +47046,7 @@
 $as_echo "$at_srcdir/learn.at:38: ovs-ofctl -O OpenFlow12 parse-flows flows.txt"
 at_fn_check_prepare_trace "learn.at:38"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 parse-flows flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47036,13 +47064,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_387
-#AT_START_388
-at_fn_group_banner 388 'learn.at:46' \
+#AT_STOP_388
+#AT_START_389
+at_fn_group_banner 389 'learn.at:46' \
   "learning action - examples" "                     " 25
 at_xfail=no
 (
-  $as_echo "388. $at_setup_line: testing $at_desc ..."
+  $as_echo "389. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >flows.txt <<'_ATEOF'
@@ -47058,7 +47086,7 @@
 $as_echo "$at_srcdir/learn.at:54: ovs-ofctl parse-flows flows.txt"
 at_fn_check_prepare_trace "learn.at:54"
 ( $at_check_trace; ovs-ofctl parse-flows flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47078,13 +47106,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_388
-#AT_START_389
-at_fn_group_banner 389 'learn.at:64' \
+#AT_STOP_389
+#AT_START_390
+at_fn_group_banner 390 'learn.at:64' \
   "learning action - satisfied prerequisites" "      " 25
 at_xfail=no
 (
-  $as_echo "389. $at_setup_line: testing $at_desc ..."
+  $as_echo "390. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 cat >flows.txt <<'_ATEOF'
@@ -47097,7 +47125,7 @@
 $as_echo "$at_srcdir/learn.at:70: ovs-ofctl parse-flows flows.txt"
 at_fn_check_prepare_trace "learn.at:70"
 ( $at_check_trace; ovs-ofctl parse-flows flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47116,20 +47144,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_389
-#AT_START_390
-at_fn_group_banner 390 'learn.at:79' \
+#AT_STOP_390
+#AT_START_391
+at_fn_group_banner 391 'learn.at:79' \
   "learning action - invalid prerequisites" "        " 25
 at_xfail=no
 (
-  $as_echo "390. $at_setup_line: testing $at_desc ..."
+  $as_echo "391. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/learn.at:80: ovs-ofctl parse-flow 'actions=learn(load:5->NXM_OF_IP_DST[])'"
 at_fn_check_prepare_trace "learn.at:80"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=learn(load:5->NXM_OF_IP_DST[])'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -47142,7 +47170,7 @@
 $as_echo "$at_srcdir/learn.at:82: sed -e 's/.*|meta_flow|WARN|//' < stderr"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:82"
 ( $at_check_trace; sed -e 's/.*|meta_flow|WARN|//' < stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47158,7 +47186,7 @@
 $as_echo "$at_srcdir/learn.at:86: ovs-ofctl parse-flow 'actions=learn(load:NXM_OF_IP_DST[]->NXM_NX_REG1[])'"
 at_fn_check_prepare_trace "learn.at:86"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=learn(load:NXM_OF_IP_DST[]->NXM_NX_REG1[])'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -47171,7 +47199,7 @@
 $as_echo "$at_srcdir/learn.at:88: sed -e 's/.*|meta_flow|WARN|//' < stderr"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:88"
 ( $at_check_trace; sed -e 's/.*|meta_flow|WARN|//' < stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47187,20 +47215,20 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_390
-#AT_START_391
-at_fn_group_banner 391 'learn.at:94' \
+#AT_STOP_391
+#AT_START_392
+at_fn_group_banner 392 'learn.at:94' \
   "learning action - too-long immediate value" "     " 25
 at_xfail=no
 (
-  $as_echo "391. $at_setup_line: testing $at_desc ..."
+  $as_echo "392. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 { set +x
 $as_echo "$at_srcdir/learn.at:96: ovs-ofctl parse-flow 'actions=learn(load:0x1fedbca9876543210fedbca9876543210->NXM_NX_IPV6_DST[])'"
 at_fn_check_prepare_trace "learn.at:96"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=learn(load:0x1fedbca9876543210fedbca9876543210->NXM_NX_IPV6_DST[])'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: 0x1fedbca9876543210fedbca9876543210->NXM_NX_IPV6_DST[]: too many bits in immediate value
@@ -47216,7 +47244,7 @@
 $as_echo "$at_srcdir/learn.at:101: ovs-ofctl parse-flow 'actions=learn(load:0xfedbca9876543210fedbca9876543210->NXM_NX_IPV6_DST[])'"
 at_fn_check_prepare_trace "learn.at:101"
 ( $at_check_trace; ovs-ofctl parse-flow 'actions=learn(load:0xfedbca9876543210fedbca9876543210->NXM_NX_IPV6_DST[])'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -47229,7 +47257,7 @@
 $as_echo "$at_srcdir/learn.at:102: sed -e 's/.*|meta_flow|WARN|//' < stderr"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:102"
 ( $at_check_trace; sed -e 's/.*|meta_flow|WARN|//' < stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47245,13 +47273,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_391
-#AT_START_392
-at_fn_group_banner 392 'learn.at:108' \
+#AT_STOP_392
+#AT_START_393
+at_fn_group_banner 393 'learn.at:108' \
   "learning action - standard VLAN+MAC learning" "   " 25
 at_xfail=no
 (
-  $as_echo "392. $at_setup_line: testing $at_desc ..."
+  $as_echo "393. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -47264,7 +47292,7 @@
 $as_echo "$at_srcdir/learn.at:109: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "learn.at:109"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47278,7 +47306,7 @@
 $as_echo "$at_srcdir/learn.at:109: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "learn.at:109"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -47300,7 +47328,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47315,7 +47343,7 @@
 $as_echo "$at_srcdir/learn.at:109: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "learn.at:109"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47330,7 +47358,7 @@
 $as_echo "$at_srcdir/learn.at:109: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "learn.at:109"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -47362,7 +47390,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47383,7 +47411,7 @@
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 -- \
    add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2 -- \
    add-port br0 p3 -- set Interface p3 type=dummy ofport_request=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47406,7 +47434,7 @@
 $as_echo "$at_srcdir/learn.at:118: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "learn.at:118"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47424,7 +47452,7 @@
 $as_echo "$at_srcdir/learn.at:122: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
 at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "learn.at:122"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47442,7 +47470,7 @@
 $as_echo "$at_srcdir/learn.at:126: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\""
 at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\"" "learn.at:126"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47458,7 +47486,7 @@
 $as_echo "$at_srcdir/learn.at:128: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\""
 at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\"" "learn.at:128"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47475,7 +47503,7 @@
 $as_echo "$at_srcdir/learn.at:131: ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:131"
 ( $at_check_trace; ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47497,7 +47525,7 @@
 $as_echo "$at_srcdir/learn.at:139: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:06,dst=50:54:00:00:00:05),eth_type(0x0806),arp(sip=192.168.0.2,tip=192.168.0.1,op=2,sha=50:54:00:00:00:06,tha=50:54:00:00:00:05)' -generate"
 at_fn_check_prepare_trace "learn.at:139"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:06,dst=50:54:00:00:00:05),eth_type(0x0806),arp(sip=192.168.0.2,tip=192.168.0.1,op=2,sha=50:54:00:00:00:06,tha=50:54:00:00:00:05)' -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47512,7 +47540,7 @@
 $as_echo "$at_srcdir/learn.at:140: tail -1 stdout"
 at_fn_check_prepare_trace "learn.at:140"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47531,7 +47559,7 @@
 $as_echo "$at_srcdir/learn.at:144: ovs-ofctl dump-flows br0 table=1 | ofctl_strip |sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:144"
 ( $at_check_trace; ovs-ofctl dump-flows br0 table=1 | ofctl_strip |sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47554,7 +47582,7 @@
 $as_echo "$at_srcdir/learn.at:153: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
 at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "learn.at:153"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47572,7 +47600,7 @@
 $as_echo "$at_srcdir/learn.at:157: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\""
 at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\"" "learn.at:157"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47588,7 +47616,7 @@
 $as_echo "$at_srcdir/learn.at:159: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\""
 at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\"" "learn.at:159"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47605,7 +47633,7 @@
 $as_echo "$at_srcdir/learn.at:162: ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:162"
 ( $at_check_trace; ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47625,7 +47653,7 @@
 $as_echo "$at_srcdir/learn.at:168: check_logs "
 at_fn_check_prepare_trace "learn.at:168"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47640,7 +47668,7 @@
 $as_echo "$at_srcdir/learn.at:168: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "learn.at:168"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47655,7 +47683,7 @@
 $as_echo "$at_srcdir/learn.at:168: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "learn.at:168"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47670,13 +47698,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_392
-#AT_START_393
-at_fn_group_banner 393 'learn.at:177' \
+#AT_STOP_393
+#AT_START_394
+at_fn_group_banner 394 'learn.at:177' \
   "learning action - learn refreshes hard_age" "     " 25
 at_xfail=no
 (
-  $as_echo "393. $at_setup_line: testing $at_desc ..."
+  $as_echo "394. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -47689,7 +47717,7 @@
 $as_echo "$at_srcdir/learn.at:178: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "learn.at:178"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47703,7 +47731,7 @@
 $as_echo "$at_srcdir/learn.at:178: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "learn.at:178"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -47725,7 +47753,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47740,7 +47768,7 @@
 $as_echo "$at_srcdir/learn.at:178: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "learn.at:178"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47755,7 +47783,7 @@
 $as_echo "$at_srcdir/learn.at:178: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "learn.at:178"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -47787,7 +47815,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47808,7 +47836,7 @@
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 -- \
    add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2 -- \
    add-port br0 p3 -- set Interface p3 type=dummy ofport_request=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47834,7 +47862,7 @@
 $as_echo "$at_srcdir/learn.at:190: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "learn.at:190"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47852,7 +47880,7 @@
 $as_echo "$at_srcdir/learn.at:194: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
 at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "learn.at:194"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47870,7 +47898,7 @@
 $as_echo "$at_srcdir/learn.at:198: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\""
 at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\"" "learn.at:198"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47886,7 +47914,7 @@
 $as_echo "$at_srcdir/learn.at:200: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\""
 at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\"" "learn.at:200"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47903,7 +47931,7 @@
 $as_echo "$at_srcdir/learn.at:203: ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:203"
 ( $at_check_trace; ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47927,7 +47955,7 @@
 $as_echo "$at_srcdir/learn.at:213: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
 at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "learn.at:213"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47944,7 +47972,7 @@
 $as_echo "$at_srcdir/learn.at:216: ovs-ofctl dump-flows br0 table=1"
 at_fn_check_prepare_trace "learn.at:216"
 ( $at_check_trace; ovs-ofctl dump-flows br0 table=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47959,7 +47987,7 @@
 $as_echo "$at_srcdir/learn.at:217: ofctl_strip < stdout | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:217"
 ( $at_check_trace; ofctl_strip < stdout | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -47985,7 +48013,7 @@
 $as_echo "$at_srcdir/learn.at:229: grep dl_dst=50:54:00:00:00:07 stdout | grep -c hard_age"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:229"
 ( $at_check_trace; grep dl_dst=50:54:00:00:00:07 stdout | grep -c hard_age
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48008,7 +48036,7 @@
 $as_echo "$at_srcdir/learn.at:238: ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:238"
 ( $at_check_trace; ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48026,7 +48054,7 @@
 $as_echo "$at_srcdir/learn.at:242: check_logs "
 at_fn_check_prepare_trace "learn.at:242"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48041,7 +48069,7 @@
 $as_echo "$at_srcdir/learn.at:242: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "learn.at:242"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48056,7 +48084,7 @@
 $as_echo "$at_srcdir/learn.at:242: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "learn.at:242"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48071,13 +48099,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_393
-#AT_START_394
-at_fn_group_banner 394 'learn.at:245' \
+#AT_STOP_394
+#AT_START_395
+at_fn_group_banner 395 'learn.at:245' \
   "learning action - TCPv4 port learning" "          " 25
 at_xfail=no
 (
-  $as_echo "394. $at_setup_line: testing $at_desc ..."
+  $as_echo "395. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -48090,7 +48118,7 @@
 $as_echo "$at_srcdir/learn.at:246: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "learn.at:246"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48104,7 +48132,7 @@
 $as_echo "$at_srcdir/learn.at:246: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "learn.at:246"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -48126,7 +48154,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48141,7 +48169,7 @@
 $as_echo "$at_srcdir/learn.at:246: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "learn.at:246"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48156,7 +48184,7 @@
 $as_echo "$at_srcdir/learn.at:246: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "learn.at:246"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -48188,7 +48216,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48209,7 +48237,7 @@
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy -- \
    add-port br0 p2 -- set Interface p2 type=dummy -- \
    add-port br0 p3 -- set Interface p3 type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48226,7 +48254,7 @@
 $as_echo "$at_srcdir/learn.at:251: ovs-ofctl add-flow br0 'table=0 tcp actions=learn(table=1, hard_timeout=60, eth_type=0x800, nw_proto=6, NXM_OF_IP_SRC[]=NXM_OF_IP_DST[], NXM_OF_IP_DST[]=NXM_OF_IP_SRC[], NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[], NXM_OF_TCP_DST[]=NXM_OF_TCP_SRC[]), flood'"
 at_fn_check_prepare_trace "learn.at:251"
 ( $at_check_trace; ovs-ofctl add-flow br0 'table=0 tcp actions=learn(table=1, hard_timeout=60, eth_type=0x800, nw_proto=6, NXM_OF_IP_SRC[]=NXM_OF_IP_DST[], NXM_OF_IP_DST[]=NXM_OF_IP_SRC[], NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[], NXM_OF_TCP_DST[]=NXM_OF_TCP_SRC[]), flood'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48244,7 +48272,7 @@
 $as_echo "$at_srcdir/learn.at:255: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
 at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "learn.at:255"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48262,7 +48290,7 @@
 $as_echo "$at_srcdir/learn.at:259: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\""
 at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\"" "learn.at:259"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48278,7 +48306,7 @@
 $as_echo "$at_srcdir/learn.at:261: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\""
 at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\"" "learn.at:261"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48295,7 +48323,7 @@
 $as_echo "$at_srcdir/learn.at:264: ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:264"
 ( $at_check_trace; ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48313,7 +48341,7 @@
 $as_echo "$at_srcdir/learn.at:268: check_logs "
 at_fn_check_prepare_trace "learn.at:268"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48328,7 +48356,7 @@
 $as_echo "$at_srcdir/learn.at:268: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "learn.at:268"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48343,7 +48371,7 @@
 $as_echo "$at_srcdir/learn.at:268: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "learn.at:268"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48358,13 +48386,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_394
-#AT_START_395
-at_fn_group_banner 395 'learn.at:271' \
+#AT_STOP_395
+#AT_START_396
+at_fn_group_banner 396 'learn.at:271' \
   "learning action - TCPv6 port learning" "          " 25
 at_xfail=no
 (
-  $as_echo "395. $at_setup_line: testing $at_desc ..."
+  $as_echo "396. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -48377,7 +48405,7 @@
 $as_echo "$at_srcdir/learn.at:272: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "learn.at:272"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48391,7 +48419,7 @@
 $as_echo "$at_srcdir/learn.at:272: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "learn.at:272"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -48413,7 +48441,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48428,7 +48456,7 @@
 $as_echo "$at_srcdir/learn.at:272: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "learn.at:272"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48443,7 +48471,7 @@
 $as_echo "$at_srcdir/learn.at:272: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "learn.at:272"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -48475,7 +48503,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48496,7 +48524,7 @@
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy -- \
    add-port br0 p2 -- set Interface p2 type=dummy -- \
    add-port br0 p3 -- set Interface p3 type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48515,7 +48543,7 @@
 $as_echo "$at_srcdir/learn.at:279: ovs-ofctl add-flow br0 'table=0 tcp6 actions=learn(table=1, hard_timeout=60, eth_type=0x86dd, nw_proto=6, NXM_NX_IPV6_SRC[]=NXM_NX_IPV6_DST[], ipv6_dst=2001:0db8:85a3:0000:0000:8a2e:0370:7334, NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[], NXM_OF_TCP_DST[]=NXM_OF_TCP_SRC[], load(0x20010db885a308d313198a2e03707348->NXM_NX_IPV6_DST[])), flood'"
 at_fn_check_prepare_trace "learn.at:279"
 ( $at_check_trace; ovs-ofctl add-flow br0 'table=0 tcp6 actions=learn(table=1, hard_timeout=60, eth_type=0x86dd, nw_proto=6, NXM_NX_IPV6_SRC[]=NXM_NX_IPV6_DST[], ipv6_dst=2001:0db8:85a3:0000:0000:8a2e:0370:7334, NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[], NXM_OF_TCP_DST[]=NXM_OF_TCP_SRC[], load(0x20010db885a308d313198a2e03707348->NXM_NX_IPV6_DST[])), flood'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48533,7 +48561,7 @@
 $as_echo "$at_srcdir/learn.at:283: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
 at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "learn.at:283"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48551,7 +48579,7 @@
 $as_echo "$at_srcdir/learn.at:287: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\""
 at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\"" "learn.at:287"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48567,7 +48595,7 @@
 $as_echo "$at_srcdir/learn.at:289: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\""
 at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\"" "learn.at:289"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48584,7 +48612,7 @@
 $as_echo "$at_srcdir/learn.at:292: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:292"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48603,7 +48631,7 @@
 $as_echo "$at_srcdir/learn.at:297: check_logs "
 at_fn_check_prepare_trace "learn.at:297"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48618,7 +48646,7 @@
 $as_echo "$at_srcdir/learn.at:297: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "learn.at:297"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48633,7 +48661,7 @@
 $as_echo "$at_srcdir/learn.at:297: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "learn.at:297"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48648,13 +48676,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_395
-#AT_START_396
-at_fn_group_banner 396 'learn.at:303' \
+#AT_STOP_396
+#AT_START_397
+at_fn_group_banner 397 'learn.at:303' \
   "learning action - self-modifying flow" "          " 25
 at_xfail=no
 (
-  $as_echo "396. $at_setup_line: testing $at_desc ..."
+  $as_echo "397. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -48667,7 +48695,7 @@
 $as_echo "$at_srcdir/learn.at:304: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "learn.at:304"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48681,7 +48709,7 @@
 $as_echo "$at_srcdir/learn.at:304: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "learn.at:304"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -48703,7 +48731,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48718,7 +48746,7 @@
 $as_echo "$at_srcdir/learn.at:304: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "learn.at:304"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48733,7 +48761,7 @@
 $as_echo "$at_srcdir/learn.at:304: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "learn.at:304"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -48765,7 +48793,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48782,7 +48810,7 @@
 $as_echo "$at_srcdir/learn.at:304: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "learn.at:304"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48805,7 +48833,7 @@
 $as_echo "$at_srcdir/learn.at:309: ovs-ofctl add-flow br0 'actions=load:3->NXM_NX_REG0[0..15],learn(table=0,priority=65535,NXM_OF_ETH_SRC[],NXM_OF_VLAN_TCI[0..11],output:NXM_NX_REG0[0..15]),output:2'"
 at_fn_check_prepare_trace "learn.at:309"
 ( $at_check_trace; ovs-ofctl add-flow br0 'actions=load:3->NXM_NX_REG0[0..15],learn(table=0,priority=65535,NXM_OF_ETH_SRC[],NXM_OF_VLAN_TCI[0..11],output:NXM_NX_REG0[0..15]),output:2'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48832,7 +48860,7 @@
 $as_echo "$at_srcdir/learn.at:322: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:322"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48853,7 +48881,7 @@
 $as_echo "$at_srcdir/learn.at:329: (ovs-ofctl dump-ports br0 2; ovs-ofctl dump-ports br0 3) | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:329"
 ( $at_check_trace; (ovs-ofctl dump-ports br0 2; ovs-ofctl dump-ports br0 3) | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48876,7 +48904,7 @@
 $as_echo "$at_srcdir/learn.at:339: check_logs "
 at_fn_check_prepare_trace "learn.at:339"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48891,7 +48919,7 @@
 $as_echo "$at_srcdir/learn.at:339: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "learn.at:339"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48906,7 +48934,7 @@
 $as_echo "$at_srcdir/learn.at:339: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "learn.at:339"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48921,13 +48949,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_396
-#AT_START_397
-at_fn_group_banner 397 'learn.at:345' \
+#AT_STOP_397
+#AT_START_398
+at_fn_group_banner 398 'learn.at:345' \
   "learning action - self-modifying flow with idle_timeout" "" 25
 at_xfail=no
 (
-  $as_echo "397. $at_setup_line: testing $at_desc ..."
+  $as_echo "398. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -48940,7 +48968,7 @@
 $as_echo "$at_srcdir/learn.at:346: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "learn.at:346"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48954,7 +48982,7 @@
 $as_echo "$at_srcdir/learn.at:346: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "learn.at:346"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -48976,7 +49004,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -48991,7 +49019,7 @@
 $as_echo "$at_srcdir/learn.at:346: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "learn.at:346"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49006,7 +49034,7 @@
 $as_echo "$at_srcdir/learn.at:346: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "learn.at:346"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -49038,7 +49066,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49055,7 +49083,7 @@
 $as_echo "$at_srcdir/learn.at:346: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "learn.at:346"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49078,7 +49106,7 @@
 $as_echo "$at_srcdir/learn.at:351: ovs-ofctl add-flow br0 'actions=load:3->NXM_NX_REG0[0..15],learn(table=0,idle_timeout=5,priority=65535,NXM_OF_ETH_SRC[],NXM_OF_VLAN_TCI[0..11],output:NXM_NX_REG0[0..15]),output:2'"
 at_fn_check_prepare_trace "learn.at:351"
 ( $at_check_trace; ovs-ofctl add-flow br0 'actions=load:3->NXM_NX_REG0[0..15],learn(table=0,idle_timeout=5,priority=65535,NXM_OF_ETH_SRC[],NXM_OF_VLAN_TCI[0..11],output:NXM_NX_REG0[0..15]),output:2'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49121,7 +49149,7 @@
 $as_echo "$at_srcdir/learn.at:380: (ovs-ofctl dump-ports br0 2; ovs-ofctl dump-ports br0 3) | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:380"
 ( $at_check_trace; (ovs-ofctl dump-ports br0 2; ovs-ofctl dump-ports br0 3) | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49146,7 +49174,7 @@
 $as_echo "$at_srcdir/learn.at:392: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:392"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49165,7 +49193,7 @@
 $as_echo "$at_srcdir/learn.at:397: check_logs "
 at_fn_check_prepare_trace "learn.at:397"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49180,7 +49208,7 @@
 $as_echo "$at_srcdir/learn.at:397: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "learn.at:397"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49195,7 +49223,7 @@
 $as_echo "$at_srcdir/learn.at:397: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "learn.at:397"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49210,13 +49238,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_397
-#AT_START_398
-at_fn_group_banner 398 'learn.at:403' \
+#AT_STOP_398
+#AT_START_399
+at_fn_group_banner 399 'learn.at:403' \
   "learning action - self-modifying flow with hard_timeout" "" 25
 at_xfail=no
 (
-  $as_echo "398. $at_setup_line: testing $at_desc ..."
+  $as_echo "399. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -49229,7 +49257,7 @@
 $as_echo "$at_srcdir/learn.at:404: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "learn.at:404"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49243,7 +49271,7 @@
 $as_echo "$at_srcdir/learn.at:404: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "learn.at:404"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -49265,7 +49293,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49280,7 +49308,7 @@
 $as_echo "$at_srcdir/learn.at:404: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "learn.at:404"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49295,7 +49323,7 @@
 $as_echo "$at_srcdir/learn.at:404: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "learn.at:404"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -49327,7 +49355,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49344,7 +49372,7 @@
 $as_echo "$at_srcdir/learn.at:404: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "learn.at:404"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49367,7 +49395,7 @@
 $as_echo "$at_srcdir/learn.at:409: ovs-ofctl add-flow br0 'actions=load:3->NXM_NX_REG0[0..15],learn(table=0,hard_timeout=10,priority=65535,NXM_OF_ETH_SRC[],NXM_OF_VLAN_TCI[0..11],output:NXM_NX_REG0[0..15]),output:2'"
 at_fn_check_prepare_trace "learn.at:409"
 ( $at_check_trace; ovs-ofctl add-flow br0 'actions=load:3->NXM_NX_REG0[0..15],learn(table=0,hard_timeout=10,priority=65535,NXM_OF_ETH_SRC[],NXM_OF_VLAN_TCI[0..11],output:NXM_NX_REG0[0..15]),output:2'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49438,7 +49466,7 @@
 $as_echo "$at_srcdir/learn.at:466: (ovs-ofctl dump-ports br0 2; ovs-ofctl dump-ports br0 3) | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:466"
 ( $at_check_trace; (ovs-ofctl dump-ports br0 2; ovs-ofctl dump-ports br0 3) | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49464,7 +49492,7 @@
 $as_echo "$at_srcdir/learn.at:479: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:479"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49483,7 +49511,7 @@
 $as_echo "$at_srcdir/learn.at:484: check_logs "
 at_fn_check_prepare_trace "learn.at:484"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49498,7 +49526,7 @@
 $as_echo "$at_srcdir/learn.at:484: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "learn.at:484"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49513,7 +49541,7 @@
 $as_echo "$at_srcdir/learn.at:484: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "learn.at:484"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49528,13 +49556,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_398
-#AT_START_399
-at_fn_group_banner 399 'learn.at:487' \
+#AT_STOP_399
+#AT_START_400
+at_fn_group_banner 400 'learn.at:487' \
   "learning action - fin_timeout feature" "          " 25
 at_xfail=no
 (
-  $as_echo "399. $at_setup_line: testing $at_desc ..."
+  $as_echo "400. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # This is a totally artificial use of the "learn" action.  The only purpose
@@ -49550,7 +49578,7 @@
 $as_echo "$at_srcdir/learn.at:491: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "learn.at:491"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49564,7 +49592,7 @@
 $as_echo "$at_srcdir/learn.at:491: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "learn.at:491"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -49586,7 +49614,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49601,7 +49629,7 @@
 $as_echo "$at_srcdir/learn.at:491: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "learn.at:491"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49616,7 +49644,7 @@
 $as_echo "$at_srcdir/learn.at:491: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "learn.at:491"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -49648,7 +49676,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49665,7 +49693,7 @@
 $as_echo "$at_srcdir/learn.at:491: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 "
 at_fn_check_prepare_trace "learn.at:491"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49681,7 +49709,7 @@
 $as_echo "$at_srcdir/learn.at:493: ovs-ofctl add-flow br0 'actions=learn(fin_hard_timeout=10, fin_idle_timeout=5, NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[], output:NXM_OF_IN_PORT[])'"
 at_fn_check_prepare_trace "learn.at:493"
 ( $at_check_trace; ovs-ofctl add-flow br0 'actions=learn(fin_hard_timeout=10, fin_idle_timeout=5, NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[], output:NXM_OF_IN_PORT[])'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49696,7 +49724,7 @@
 $as_echo "$at_srcdir/learn.at:494: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)' -generate"
 at_fn_check_prepare_trace "learn.at:494"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)' -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49711,7 +49739,7 @@
 $as_echo "$at_srcdir/learn.at:495: ovs-ofctl dump-flows br0 table=1 | ofctl_strip"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:495"
 ( $at_check_trace; ovs-ofctl dump-flows br0 table=1 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49729,7 +49757,7 @@
 $as_echo "$at_srcdir/learn.at:499: check_logs "
 at_fn_check_prepare_trace "learn.at:499"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49744,7 +49772,7 @@
 $as_echo "$at_srcdir/learn.at:499: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "learn.at:499"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49759,7 +49787,7 @@
 $as_echo "$at_srcdir/learn.at:499: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "learn.at:499"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49774,13 +49802,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_399
-#AT_START_400
-at_fn_group_banner 400 'learn.at:502' \
+#AT_STOP_400
+#AT_START_401
+at_fn_group_banner 401 'learn.at:502' \
   "learning action - delete_learned feature" "       " 25
 at_xfail=no
 (
-  $as_echo "400. $at_setup_line: testing $at_desc ..."
+  $as_echo "401. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -49793,7 +49821,7 @@
 $as_echo "$at_srcdir/learn.at:503: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "learn.at:503"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49807,7 +49835,7 @@
 $as_echo "$at_srcdir/learn.at:503: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "learn.at:503"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -49829,7 +49857,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49844,7 +49872,7 @@
 $as_echo "$at_srcdir/learn.at:503: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "learn.at:503"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49859,7 +49887,7 @@
 $as_echo "$at_srcdir/learn.at:503: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "learn.at:503"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -49891,7 +49919,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49908,7 +49936,7 @@
 $as_echo "$at_srcdir/learn.at:503: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "learn.at:503"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49935,7 +49963,7 @@
 $as_echo "$at_srcdir/learn.at:514: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "learn.at:514"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49950,7 +49978,7 @@
 $as_echo "$at_srcdir/learn.at:515: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:515"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49976,7 +50004,7 @@
 $as_echo "$at_srcdir/learn.at:527: ovs-ofctl del-flows br0 'table=0 reg0=1'"
 at_fn_check_prepare_trace "learn.at:527"
 ( $at_check_trace; ovs-ofctl del-flows br0 'table=0 reg0=1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -49991,7 +50019,7 @@
 $as_echo "$at_srcdir/learn.at:528: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:528"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50016,7 +50044,7 @@
 $as_echo "$at_srcdir/learn.at:539: ovs-ofctl mod-flows br0 'table=0 reg0=2 actions=output:1,learn(delete_learned,cookie=0x123)'"
 at_fn_check_prepare_trace "learn.at:539"
 ( $at_check_trace; ovs-ofctl mod-flows br0 'table=0 reg0=2 actions=output:1,learn(delete_learned,cookie=0x123)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50031,7 +50059,7 @@
 $as_echo "$at_srcdir/learn.at:540: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:540"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50056,7 +50084,7 @@
 $as_echo "$at_srcdir/learn.at:551: ovs-ofctl mod-flows br0 'table=0 reg0=2 actions=learn(delete_learned,cookie=0x234)'"
 at_fn_check_prepare_trace "learn.at:551"
 ( $at_check_trace; ovs-ofctl mod-flows br0 'table=0 reg0=2 actions=learn(delete_learned,cookie=0x234)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50071,7 +50099,7 @@
 $as_echo "$at_srcdir/learn.at:552: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:552"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50094,7 +50122,7 @@
 $as_echo "$at_srcdir/learn.at:561: ovs-ofctl add-flow br0 'table=0 reg0=2 actions=learn(delete_learned,cookie=0x234),output:2'"
 at_fn_check_prepare_trace "learn.at:561"
 ( $at_check_trace; ovs-ofctl add-flow br0 'table=0 reg0=2 actions=learn(delete_learned,cookie=0x234),output:2'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50109,7 +50137,7 @@
 $as_echo "$at_srcdir/learn.at:562: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:562"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50131,7 +50159,7 @@
 $as_echo "$at_srcdir/learn.at:570: ovs-ofctl del-flows br0 table=0"
 at_fn_check_prepare_trace "learn.at:570"
 ( $at_check_trace; ovs-ofctl del-flows br0 table=0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50146,7 +50174,7 @@
 $as_echo "$at_srcdir/learn.at:571: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:571"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50183,7 +50211,7 @@
 $as_echo "$at_srcdir/learn.at:593: ovs-ofctl del-flows br0"
 at_fn_check_prepare_trace "learn.at:593"
 ( $at_check_trace; ovs-ofctl del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50198,7 +50226,7 @@
 $as_echo "$at_srcdir/learn.at:594: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "learn.at:594"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50213,7 +50241,7 @@
 $as_echo "$at_srcdir/learn.at:595: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:595"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50243,7 +50271,7 @@
 $as_echo "$at_srcdir/learn.at:611: ovs-ofctl del-flows br0 'table=0 reg0=1'"
 at_fn_check_prepare_trace "learn.at:611"
 ( $at_check_trace; ovs-ofctl del-flows br0 'table=0 reg0=1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50258,7 +50286,7 @@
 $as_echo "$at_srcdir/learn.at:612: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:612"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50283,7 +50311,7 @@
 $as_echo "$at_srcdir/learn.at:623: ovs-ofctl del-flows br0 'table=0 reg0=2'"
 at_fn_check_prepare_trace "learn.at:623"
 ( $at_check_trace; ovs-ofctl del-flows br0 'table=0 reg0=2'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50298,7 +50326,7 @@
 $as_echo "$at_srcdir/learn.at:624: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "learn.at:624"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50315,7 +50343,7 @@
 $as_echo "$at_srcdir/learn.at:627: check_logs "
 at_fn_check_prepare_trace "learn.at:627"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50330,7 +50358,7 @@
 $as_echo "$at_srcdir/learn.at:627: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "learn.at:627"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50345,7 +50373,7 @@
 $as_echo "$at_srcdir/learn.at:627: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "learn.at:627"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50360,13 +50388,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_400
-#AT_START_401
-at_fn_group_banner 401 'vconn.at:21' \
+#AT_STOP_401
+#AT_START_402
+at_fn_group_banner 402 'vconn.at:21' \
   "unix vconn - refuse connection" "                 " 26
 at_xfail=no
 (
-  $as_echo "401. $at_setup_line: testing $at_desc ..."
+  $as_echo "402. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50375,7 +50403,7 @@
 $as_echo "$at_srcdir/vconn.at:21: ovstest test-vconn refuse-connection unix"
 at_fn_check_prepare_trace "vconn.at:21"
 ( $at_check_trace; ovstest test-vconn refuse-connection unix
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50388,13 +50416,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_401
-#AT_START_402
-at_fn_group_banner 402 'vconn.at:21' \
+#AT_STOP_402
+#AT_START_403
+at_fn_group_banner 403 'vconn.at:21' \
   "unix vconn - accept then close" "                 " 26
 at_xfail=no
 (
-  $as_echo "402. $at_setup_line: testing $at_desc ..."
+  $as_echo "403. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50403,7 +50431,7 @@
 $as_echo "$at_srcdir/vconn.at:21: ovstest test-vconn accept-then-close unix"
 at_fn_check_prepare_trace "vconn.at:21"
 ( $at_check_trace; ovstest test-vconn accept-then-close unix
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50416,13 +50444,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_402
-#AT_START_403
-at_fn_group_banner 403 'vconn.at:21' \
+#AT_STOP_403
+#AT_START_404
+at_fn_group_banner 404 'vconn.at:21' \
   "unix vconn - read hello" "                        " 26
 at_xfail=no
 (
-  $as_echo "403. $at_setup_line: testing $at_desc ..."
+  $as_echo "404. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50431,7 +50459,7 @@
 $as_echo "$at_srcdir/vconn.at:21: ovstest test-vconn read-hello unix"
 at_fn_check_prepare_trace "vconn.at:21"
 ( $at_check_trace; ovstest test-vconn read-hello unix
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50444,13 +50472,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_403
-#AT_START_404
-at_fn_group_banner 404 'vconn.at:21' \
+#AT_STOP_404
+#AT_START_405
+at_fn_group_banner 405 'vconn.at:21' \
   "unix vconn - send plain hello" "                  " 26
 at_xfail=no
 (
-  $as_echo "404. $at_setup_line: testing $at_desc ..."
+  $as_echo "405. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50459,7 +50487,7 @@
 $as_echo "$at_srcdir/vconn.at:21: ovstest test-vconn send-plain-hello unix"
 at_fn_check_prepare_trace "vconn.at:21"
 ( $at_check_trace; ovstest test-vconn send-plain-hello unix
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50472,13 +50500,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_404
-#AT_START_405
-at_fn_group_banner 405 'vconn.at:21' \
+#AT_STOP_405
+#AT_START_406
+at_fn_group_banner 406 'vconn.at:21' \
   "unix vconn - send long hello" "                   " 26
 at_xfail=no
 (
-  $as_echo "405. $at_setup_line: testing $at_desc ..."
+  $as_echo "406. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50487,7 +50515,7 @@
 $as_echo "$at_srcdir/vconn.at:21: ovstest test-vconn send-long-hello unix"
 at_fn_check_prepare_trace "vconn.at:21"
 ( $at_check_trace; ovstest test-vconn send-long-hello unix
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50500,13 +50528,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_405
-#AT_START_406
-at_fn_group_banner 406 'vconn.at:21' \
+#AT_STOP_406
+#AT_START_407
+at_fn_group_banner 407 'vconn.at:21' \
   "unix vconn - send echo hello" "                   " 26
 at_xfail=no
 (
-  $as_echo "406. $at_setup_line: testing $at_desc ..."
+  $as_echo "407. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50515,7 +50543,7 @@
 $as_echo "$at_srcdir/vconn.at:21: ovstest test-vconn send-echo-hello unix"
 at_fn_check_prepare_trace "vconn.at:21"
 ( $at_check_trace; ovstest test-vconn send-echo-hello unix
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50528,13 +50556,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_406
-#AT_START_407
-at_fn_group_banner 407 'vconn.at:21' \
+#AT_STOP_407
+#AT_START_408
+at_fn_group_banner 408 'vconn.at:21' \
   "unix vconn - send short hello" "                  " 26
 at_xfail=no
 (
-  $as_echo "407. $at_setup_line: testing $at_desc ..."
+  $as_echo "408. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50543,7 +50571,7 @@
 $as_echo "$at_srcdir/vconn.at:21: ovstest test-vconn send-short-hello unix"
 at_fn_check_prepare_trace "vconn.at:21"
 ( $at_check_trace; ovstest test-vconn send-short-hello unix
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50556,13 +50584,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_407
-#AT_START_408
-at_fn_group_banner 408 'vconn.at:21' \
+#AT_STOP_408
+#AT_START_409
+at_fn_group_banner 409 'vconn.at:21' \
   "unix vconn - send invalid version hello" "        " 26
 at_xfail=no
 (
-  $as_echo "408. $at_setup_line: testing $at_desc ..."
+  $as_echo "409. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50571,7 +50599,7 @@
 $as_echo "$at_srcdir/vconn.at:21: ovstest test-vconn send-invalid-version-hello unix"
 at_fn_check_prepare_trace "vconn.at:21"
 ( $at_check_trace; ovstest test-vconn send-invalid-version-hello unix
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50584,13 +50612,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_408
-#AT_START_409
-at_fn_group_banner 409 'vconn.at:22' \
+#AT_STOP_409
+#AT_START_410
+at_fn_group_banner 410 'vconn.at:22' \
   "tcp vconn - refuse connection" "                  " 27
 at_xfail=no
 (
-  $as_echo "409. $at_setup_line: testing $at_desc ..."
+  $as_echo "410. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50599,7 +50627,7 @@
 $as_echo "$at_srcdir/vconn.at:22: ovstest test-vconn refuse-connection tcp"
 at_fn_check_prepare_trace "vconn.at:22"
 ( $at_check_trace; ovstest test-vconn refuse-connection tcp
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50612,13 +50640,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_409
-#AT_START_410
-at_fn_group_banner 410 'vconn.at:22' \
+#AT_STOP_410
+#AT_START_411
+at_fn_group_banner 411 'vconn.at:22' \
   "tcp vconn - accept then close" "                  " 27
 at_xfail=no
 (
-  $as_echo "410. $at_setup_line: testing $at_desc ..."
+  $as_echo "411. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50627,7 +50655,7 @@
 $as_echo "$at_srcdir/vconn.at:22: ovstest test-vconn accept-then-close tcp"
 at_fn_check_prepare_trace "vconn.at:22"
 ( $at_check_trace; ovstest test-vconn accept-then-close tcp
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50640,13 +50668,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_410
-#AT_START_411
-at_fn_group_banner 411 'vconn.at:22' \
+#AT_STOP_411
+#AT_START_412
+at_fn_group_banner 412 'vconn.at:22' \
   "tcp vconn - read hello" "                         " 27
 at_xfail=no
 (
-  $as_echo "411. $at_setup_line: testing $at_desc ..."
+  $as_echo "412. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50655,7 +50683,7 @@
 $as_echo "$at_srcdir/vconn.at:22: ovstest test-vconn read-hello tcp"
 at_fn_check_prepare_trace "vconn.at:22"
 ( $at_check_trace; ovstest test-vconn read-hello tcp
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50668,13 +50696,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_411
-#AT_START_412
-at_fn_group_banner 412 'vconn.at:22' \
+#AT_STOP_412
+#AT_START_413
+at_fn_group_banner 413 'vconn.at:22' \
   "tcp vconn - send plain hello" "                   " 27
 at_xfail=no
 (
-  $as_echo "412. $at_setup_line: testing $at_desc ..."
+  $as_echo "413. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50683,7 +50711,7 @@
 $as_echo "$at_srcdir/vconn.at:22: ovstest test-vconn send-plain-hello tcp"
 at_fn_check_prepare_trace "vconn.at:22"
 ( $at_check_trace; ovstest test-vconn send-plain-hello tcp
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50696,13 +50724,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_412
-#AT_START_413
-at_fn_group_banner 413 'vconn.at:22' \
+#AT_STOP_413
+#AT_START_414
+at_fn_group_banner 414 'vconn.at:22' \
   "tcp vconn - send long hello" "                    " 27
 at_xfail=no
 (
-  $as_echo "413. $at_setup_line: testing $at_desc ..."
+  $as_echo "414. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50711,7 +50739,7 @@
 $as_echo "$at_srcdir/vconn.at:22: ovstest test-vconn send-long-hello tcp"
 at_fn_check_prepare_trace "vconn.at:22"
 ( $at_check_trace; ovstest test-vconn send-long-hello tcp
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50724,13 +50752,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_413
-#AT_START_414
-at_fn_group_banner 414 'vconn.at:22' \
+#AT_STOP_414
+#AT_START_415
+at_fn_group_banner 415 'vconn.at:22' \
   "tcp vconn - send echo hello" "                    " 27
 at_xfail=no
 (
-  $as_echo "414. $at_setup_line: testing $at_desc ..."
+  $as_echo "415. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50739,7 +50767,7 @@
 $as_echo "$at_srcdir/vconn.at:22: ovstest test-vconn send-echo-hello tcp"
 at_fn_check_prepare_trace "vconn.at:22"
 ( $at_check_trace; ovstest test-vconn send-echo-hello tcp
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50752,13 +50780,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_414
-#AT_START_415
-at_fn_group_banner 415 'vconn.at:22' \
+#AT_STOP_415
+#AT_START_416
+at_fn_group_banner 416 'vconn.at:22' \
   "tcp vconn - send short hello" "                   " 27
 at_xfail=no
 (
-  $as_echo "415. $at_setup_line: testing $at_desc ..."
+  $as_echo "416. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50767,7 +50795,7 @@
 $as_echo "$at_srcdir/vconn.at:22: ovstest test-vconn send-short-hello tcp"
 at_fn_check_prepare_trace "vconn.at:22"
 ( $at_check_trace; ovstest test-vconn send-short-hello tcp
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50780,13 +50808,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_415
-#AT_START_416
-at_fn_group_banner 416 'vconn.at:22' \
+#AT_STOP_416
+#AT_START_417
+at_fn_group_banner 417 'vconn.at:22' \
   "tcp vconn - send invalid version hello" "         " 27
 at_xfail=no
 (
-  $as_echo "416. $at_setup_line: testing $at_desc ..."
+  $as_echo "417. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50795,7 +50823,7 @@
 $as_echo "$at_srcdir/vconn.at:22: ovstest test-vconn send-invalid-version-hello tcp"
 at_fn_check_prepare_trace "vconn.at:22"
 ( $at_check_trace; ovstest test-vconn send-invalid-version-hello tcp
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50808,13 +50836,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_416
-#AT_START_417
-at_fn_group_banner 417 'vconn.at:23' \
+#AT_STOP_417
+#AT_START_418
+at_fn_group_banner 418 'vconn.at:23' \
   "ssl vconn - refuse connection" "                  " 28
 at_xfail=no
 (
-  $as_echo "417. $at_setup_line: testing $at_desc ..."
+  $as_echo "418. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50826,7 +50854,7 @@
 $as_echo "$at_srcdir/vconn.at:23: cp \$abs_top_builddir/tests/testpki*.pem ."
 at_fn_check_prepare_dynamic "cp $abs_top_builddir/tests/testpki*.pem ." "vconn.at:23"
 ( $at_check_trace; cp $abs_top_builddir/tests/testpki*.pem .
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50839,7 +50867,7 @@
 $as_echo "$at_srcdir/vconn.at:23: ovstest test-vconn refuse-connection ssl"
 at_fn_check_prepare_trace "vconn.at:23"
 ( $at_check_trace; ovstest test-vconn refuse-connection ssl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50852,13 +50880,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_417
-#AT_START_418
-at_fn_group_banner 418 'vconn.at:23' \
+#AT_STOP_418
+#AT_START_419
+at_fn_group_banner 419 'vconn.at:23' \
   "ssl vconn - accept then close" "                  " 28
 at_xfail=no
 (
-  $as_echo "418. $at_setup_line: testing $at_desc ..."
+  $as_echo "419. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50870,7 +50898,7 @@
 $as_echo "$at_srcdir/vconn.at:23: cp \$abs_top_builddir/tests/testpki*.pem ."
 at_fn_check_prepare_dynamic "cp $abs_top_builddir/tests/testpki*.pem ." "vconn.at:23"
 ( $at_check_trace; cp $abs_top_builddir/tests/testpki*.pem .
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50883,7 +50911,7 @@
 $as_echo "$at_srcdir/vconn.at:23: ovstest test-vconn accept-then-close ssl"
 at_fn_check_prepare_trace "vconn.at:23"
 ( $at_check_trace; ovstest test-vconn accept-then-close ssl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50896,13 +50924,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_418
-#AT_START_419
-at_fn_group_banner 419 'vconn.at:23' \
+#AT_STOP_419
+#AT_START_420
+at_fn_group_banner 420 'vconn.at:23' \
   "ssl vconn - read hello" "                         " 28
 at_xfail=no
 (
-  $as_echo "419. $at_setup_line: testing $at_desc ..."
+  $as_echo "420. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50914,7 +50942,7 @@
 $as_echo "$at_srcdir/vconn.at:23: cp \$abs_top_builddir/tests/testpki*.pem ."
 at_fn_check_prepare_dynamic "cp $abs_top_builddir/tests/testpki*.pem ." "vconn.at:23"
 ( $at_check_trace; cp $abs_top_builddir/tests/testpki*.pem .
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50927,7 +50955,7 @@
 $as_echo "$at_srcdir/vconn.at:23: ovstest test-vconn read-hello ssl"
 at_fn_check_prepare_trace "vconn.at:23"
 ( $at_check_trace; ovstest test-vconn read-hello ssl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50940,13 +50968,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_419
-#AT_START_420
-at_fn_group_banner 420 'vconn.at:23' \
+#AT_STOP_420
+#AT_START_421
+at_fn_group_banner 421 'vconn.at:23' \
   "ssl vconn - send plain hello" "                   " 28
 at_xfail=no
 (
-  $as_echo "420. $at_setup_line: testing $at_desc ..."
+  $as_echo "421. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -50958,7 +50986,7 @@
 $as_echo "$at_srcdir/vconn.at:23: cp \$abs_top_builddir/tests/testpki*.pem ."
 at_fn_check_prepare_dynamic "cp $abs_top_builddir/tests/testpki*.pem ." "vconn.at:23"
 ( $at_check_trace; cp $abs_top_builddir/tests/testpki*.pem .
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -50971,7 +50999,7 @@
 $as_echo "$at_srcdir/vconn.at:23: ovstest test-vconn send-plain-hello ssl"
 at_fn_check_prepare_trace "vconn.at:23"
 ( $at_check_trace; ovstest test-vconn send-plain-hello ssl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -50984,13 +51012,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_420
-#AT_START_421
-at_fn_group_banner 421 'vconn.at:23' \
+#AT_STOP_421
+#AT_START_422
+at_fn_group_banner 422 'vconn.at:23' \
   "ssl vconn - send long hello" "                    " 28
 at_xfail=no
 (
-  $as_echo "421. $at_setup_line: testing $at_desc ..."
+  $as_echo "422. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -51002,7 +51030,7 @@
 $as_echo "$at_srcdir/vconn.at:23: cp \$abs_top_builddir/tests/testpki*.pem ."
 at_fn_check_prepare_dynamic "cp $abs_top_builddir/tests/testpki*.pem ." "vconn.at:23"
 ( $at_check_trace; cp $abs_top_builddir/tests/testpki*.pem .
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51015,7 +51043,7 @@
 $as_echo "$at_srcdir/vconn.at:23: ovstest test-vconn send-long-hello ssl"
 at_fn_check_prepare_trace "vconn.at:23"
 ( $at_check_trace; ovstest test-vconn send-long-hello ssl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -51028,13 +51056,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_421
-#AT_START_422
-at_fn_group_banner 422 'vconn.at:23' \
+#AT_STOP_422
+#AT_START_423
+at_fn_group_banner 423 'vconn.at:23' \
   "ssl vconn - send echo hello" "                    " 28
 at_xfail=no
 (
-  $as_echo "422. $at_setup_line: testing $at_desc ..."
+  $as_echo "423. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -51046,7 +51074,7 @@
 $as_echo "$at_srcdir/vconn.at:23: cp \$abs_top_builddir/tests/testpki*.pem ."
 at_fn_check_prepare_dynamic "cp $abs_top_builddir/tests/testpki*.pem ." "vconn.at:23"
 ( $at_check_trace; cp $abs_top_builddir/tests/testpki*.pem .
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51059,7 +51087,7 @@
 $as_echo "$at_srcdir/vconn.at:23: ovstest test-vconn send-echo-hello ssl"
 at_fn_check_prepare_trace "vconn.at:23"
 ( $at_check_trace; ovstest test-vconn send-echo-hello ssl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -51072,13 +51100,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_422
-#AT_START_423
-at_fn_group_banner 423 'vconn.at:23' \
+#AT_STOP_423
+#AT_START_424
+at_fn_group_banner 424 'vconn.at:23' \
   "ssl vconn - send short hello" "                   " 28
 at_xfail=no
 (
-  $as_echo "423. $at_setup_line: testing $at_desc ..."
+  $as_echo "424. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -51090,7 +51118,7 @@
 $as_echo "$at_srcdir/vconn.at:23: cp \$abs_top_builddir/tests/testpki*.pem ."
 at_fn_check_prepare_dynamic "cp $abs_top_builddir/tests/testpki*.pem ." "vconn.at:23"
 ( $at_check_trace; cp $abs_top_builddir/tests/testpki*.pem .
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51103,7 +51131,7 @@
 $as_echo "$at_srcdir/vconn.at:23: ovstest test-vconn send-short-hello ssl"
 at_fn_check_prepare_trace "vconn.at:23"
 ( $at_check_trace; ovstest test-vconn send-short-hello ssl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -51116,13 +51144,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_423
-#AT_START_424
-at_fn_group_banner 424 'vconn.at:23' \
+#AT_STOP_424
+#AT_START_425
+at_fn_group_banner 425 'vconn.at:23' \
   "ssl vconn - send invalid version hello" "         " 28
 at_xfail=no
 (
-  $as_echo "424. $at_setup_line: testing $at_desc ..."
+  $as_echo "425. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
      OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -51134,7 +51162,7 @@
 $as_echo "$at_srcdir/vconn.at:23: cp \$abs_top_builddir/tests/testpki*.pem ."
 at_fn_check_prepare_dynamic "cp $abs_top_builddir/tests/testpki*.pem ." "vconn.at:23"
 ( $at_check_trace; cp $abs_top_builddir/tests/testpki*.pem .
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51147,7 +51175,7 @@
 $as_echo "$at_srcdir/vconn.at:23: ovstest test-vconn send-invalid-version-hello ssl"
 at_fn_check_prepare_trace "vconn.at:23"
 ( $at_check_trace; ovstest test-vconn send-invalid-version-hello ssl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -51160,13 +51188,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_424
-#AT_START_425
-at_fn_group_banner 425 'file_name.at:13' \
+#AT_STOP_425
+#AT_START_426
+at_fn_group_banner 426 'file_name.at:13' \
   "components of \"/usr/lib\" are \"/usr\", \"lib\"" "     " 29
 at_xfail=no
 (
-  $as_echo "425. $at_setup_line: testing $at_desc ..."
+  $as_echo "426. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:13" >"$at_check_line_file"
@@ -51177,7 +51205,7 @@
 $as_echo "$at_srcdir/file_name.at:13: ovstest test-util file_name \"/usr/lib\""
 at_fn_check_prepare_trace "file_name.at:13"
 ( $at_check_trace; ovstest test-util file_name "/usr/lib"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51193,13 +51221,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_425
-#AT_START_426
-at_fn_group_banner 426 'file_name.at:14' \
+#AT_STOP_426
+#AT_START_427
+at_fn_group_banner 427 'file_name.at:14' \
   "components of \"/usr/\" are \"/\", \"usr\"" "           " 29
 at_xfail=no
 (
-  $as_echo "426. $at_setup_line: testing $at_desc ..."
+  $as_echo "427. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:14" >"$at_check_line_file"
@@ -51210,7 +51238,7 @@
 $as_echo "$at_srcdir/file_name.at:14: ovstest test-util file_name \"/usr/\""
 at_fn_check_prepare_trace "file_name.at:14"
 ( $at_check_trace; ovstest test-util file_name "/usr/"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51226,13 +51254,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_426
-#AT_START_427
-at_fn_group_banner 427 'file_name.at:15' \
+#AT_STOP_427
+#AT_START_428
+at_fn_group_banner 428 'file_name.at:15' \
   "components of \"usr\" are \".\", \"usr\"" "             " 29
 at_xfail=no
 (
-  $as_echo "427. $at_setup_line: testing $at_desc ..."
+  $as_echo "428. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:15" >"$at_check_line_file"
@@ -51243,7 +51271,7 @@
 $as_echo "$at_srcdir/file_name.at:15: ovstest test-util file_name \"usr\""
 at_fn_check_prepare_trace "file_name.at:15"
 ( $at_check_trace; ovstest test-util file_name "usr"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51259,13 +51287,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_427
-#AT_START_428
-at_fn_group_banner 428 'file_name.at:16' \
+#AT_STOP_428
+#AT_START_429
+at_fn_group_banner 429 'file_name.at:16' \
   "components of \"/\" are \"/\", \"/\"" "                 " 29
 at_xfail=no
 (
-  $as_echo "428. $at_setup_line: testing $at_desc ..."
+  $as_echo "429. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:16" >"$at_check_line_file"
@@ -51276,7 +51304,7 @@
 $as_echo "$at_srcdir/file_name.at:16: ovstest test-util file_name \"/\""
 at_fn_check_prepare_trace "file_name.at:16"
 ( $at_check_trace; ovstest test-util file_name "/"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51292,13 +51320,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_428
-#AT_START_429
-at_fn_group_banner 429 'file_name.at:17' \
+#AT_STOP_429
+#AT_START_430
+at_fn_group_banner 430 'file_name.at:17' \
   "components of \".\" are \".\", \".\"" "                 " 29
 at_xfail=no
 (
-  $as_echo "429. $at_setup_line: testing $at_desc ..."
+  $as_echo "430. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:17" >"$at_check_line_file"
@@ -51309,7 +51337,7 @@
 $as_echo "$at_srcdir/file_name.at:17: ovstest test-util file_name \".\""
 at_fn_check_prepare_trace "file_name.at:17"
 ( $at_check_trace; ovstest test-util file_name "."
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51325,13 +51353,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_429
-#AT_START_430
-at_fn_group_banner 430 'file_name.at:18' \
+#AT_STOP_430
+#AT_START_431
+at_fn_group_banner 431 'file_name.at:18' \
   "components of \"..\" are \".\", \"..\"" "               " 29
 at_xfail=no
 (
-  $as_echo "430. $at_setup_line: testing $at_desc ..."
+  $as_echo "431. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:18" >"$at_check_line_file"
@@ -51342,7 +51370,7 @@
 $as_echo "$at_srcdir/file_name.at:18: ovstest test-util file_name \"..\""
 at_fn_check_prepare_trace "file_name.at:18"
 ( $at_check_trace; ovstest test-util file_name ".."
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51358,13 +51386,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_430
-#AT_START_431
-at_fn_group_banner 431 'file_name.at:19' \
+#AT_STOP_431
+#AT_START_432
+at_fn_group_banner 432 'file_name.at:19' \
   "components of \"//\" are \"//\", \"//\"" "              " 29
 at_xfail=no
 (
-  $as_echo "431. $at_setup_line: testing $at_desc ..."
+  $as_echo "432. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:19" >"$at_check_line_file"
@@ -51375,7 +51403,7 @@
 $as_echo "$at_srcdir/file_name.at:19: ovstest test-util file_name \"//\""
 at_fn_check_prepare_trace "file_name.at:19"
 ( $at_check_trace; ovstest test-util file_name "//"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51391,13 +51419,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_431
-#AT_START_432
-at_fn_group_banner 432 'file_name.at:20' \
+#AT_STOP_432
+#AT_START_433
+at_fn_group_banner 433 'file_name.at:20' \
   "components of \"//foo\" are \"//\", \"foo\"" "          " 29
 at_xfail=no
 (
-  $as_echo "432. $at_setup_line: testing $at_desc ..."
+  $as_echo "433. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:20" >"$at_check_line_file"
@@ -51408,7 +51436,7 @@
 $as_echo "$at_srcdir/file_name.at:20: ovstest test-util file_name \"//foo\""
 at_fn_check_prepare_trace "file_name.at:20"
 ( $at_check_trace; ovstest test-util file_name "//foo"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51424,13 +51452,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_432
-#AT_START_433
-at_fn_group_banner 433 'file_name.at:21' \
+#AT_STOP_433
+#AT_START_434
+at_fn_group_banner 434 'file_name.at:21' \
   "components of \"\" are \".\", \".\"" "                  " 29
 at_xfail=no
 (
-  $as_echo "433. $at_setup_line: testing $at_desc ..."
+  $as_echo "434. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:21" >"$at_check_line_file"
@@ -51441,7 +51469,7 @@
 $as_echo "$at_srcdir/file_name.at:21: ovstest test-util file_name \"\""
 at_fn_check_prepare_trace "file_name.at:21"
 ( $at_check_trace; ovstest test-util file_name ""
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51457,13 +51485,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_433
-#AT_START_434
-at_fn_group_banner 434 'file_name.at:24' \
+#AT_STOP_434
+#AT_START_435
+at_fn_group_banner 435 'file_name.at:24' \
   "components of \"dir/file\" are \"dir\", \"file\"" "     " 29
 at_xfail=no
 (
-  $as_echo "434. $at_setup_line: testing $at_desc ..."
+  $as_echo "435. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:24" >"$at_check_line_file"
@@ -51474,7 +51502,7 @@
 $as_echo "$at_srcdir/file_name.at:24: ovstest test-util file_name \"dir/file\""
 at_fn_check_prepare_trace "file_name.at:24"
 ( $at_check_trace; ovstest test-util file_name "dir/file"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51490,13 +51518,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_434
-#AT_START_435
-at_fn_group_banner 435 'file_name.at:25' \
+#AT_STOP_435
+#AT_START_436
+at_fn_group_banner 436 'file_name.at:25' \
   "components of \"dir/file/\" are \"dir\", \"file\"" "    " 29
 at_xfail=no
 (
-  $as_echo "435. $at_setup_line: testing $at_desc ..."
+  $as_echo "436. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:25" >"$at_check_line_file"
@@ -51507,7 +51535,7 @@
 $as_echo "$at_srcdir/file_name.at:25: ovstest test-util file_name \"dir/file/\""
 at_fn_check_prepare_trace "file_name.at:25"
 ( $at_check_trace; ovstest test-util file_name "dir/file/"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51523,13 +51551,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_435
-#AT_START_436
-at_fn_group_banner 436 'file_name.at:26' \
+#AT_STOP_436
+#AT_START_437
+at_fn_group_banner 437 'file_name.at:26' \
   "components of \"dir/file//\" are \"dir\", \"file\"" "   " 29
 at_xfail=no
 (
-  $as_echo "436. $at_setup_line: testing $at_desc ..."
+  $as_echo "437. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:26" >"$at_check_line_file"
@@ -51540,7 +51568,7 @@
 $as_echo "$at_srcdir/file_name.at:26: ovstest test-util file_name \"dir/file//\""
 at_fn_check_prepare_trace "file_name.at:26"
 ( $at_check_trace; ovstest test-util file_name "dir/file//"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51556,13 +51584,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_436
-#AT_START_437
-at_fn_group_banner 437 'file_name.at:27' \
+#AT_STOP_437
+#AT_START_438
+at_fn_group_banner 438 'file_name.at:27' \
   "components of \"///foo\" are \"/\", \"foo\"" "          " 29
 at_xfail=no
 (
-  $as_echo "437. $at_setup_line: testing $at_desc ..."
+  $as_echo "438. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "file_name.at:27" >"$at_check_line_file"
@@ -51573,7 +51601,7 @@
 $as_echo "$at_srcdir/file_name.at:27: ovstest test-util file_name \"///foo\""
 at_fn_check_prepare_trace "file_name.at:27"
 ( $at_check_trace; ovstest test-util file_name "///foo"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51589,13 +51617,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_437
-#AT_START_438
-at_fn_group_banner 438 'file_name.at:37' \
+#AT_STOP_438
+#AT_START_439
+at_fn_group_banner 439 'file_name.at:37' \
   "follow_symlinks - relative symlinks" "            " 30
 at_xfail=no
 (
-  $as_echo "438. $at_setup_line: testing $at_desc ..."
+  $as_echo "439. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 : > target
@@ -51608,7 +51636,7 @@
 $as_echo "$at_srcdir/file_name.at:41: ovstest test-util follow-symlinks \"source\""
 at_fn_check_prepare_trace "file_name.at:41"
 ( $at_check_trace; ovstest test-util follow-symlinks "source"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51628,7 +51656,7 @@
 $as_echo "$at_srcdir/file_name.at:45: ovstest test-util follow-symlinks \"dir/source2\""
 at_fn_check_prepare_trace "file_name.at:45"
 ( $at_check_trace; ovstest test-util follow-symlinks "dir/source2"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51650,7 +51678,7 @@
 $as_echo "$at_srcdir/file_name.at:51: ovstest test-util follow-symlinks \"a\""
 at_fn_check_prepare_trace "file_name.at:51"
 ( $at_check_trace; ovstest test-util follow-symlinks "a"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51666,13 +51694,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_438
-#AT_START_439
-at_fn_group_banner 439 'file_name.at:54' \
+#AT_STOP_439
+#AT_START_440
+at_fn_group_banner 440 'file_name.at:54' \
   "follow_symlinks - absolute symlinks" "            " 30
 at_xfail=no
 (
-  $as_echo "439. $at_setup_line: testing $at_desc ..."
+  $as_echo "440. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 : > target
@@ -51685,7 +51713,7 @@
 $as_echo "$at_srcdir/file_name.at:58: ovstest test-util follow-symlinks \"source\""
 at_fn_check_prepare_trace "file_name.at:58"
 ( $at_check_trace; ovstest test-util follow-symlinks "source"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51705,7 +51733,7 @@
 $as_echo "$at_srcdir/file_name.at:62: ovstest test-util follow-symlinks \"dir/source2\""
 at_fn_check_prepare_trace "file_name.at:62"
 ( $at_check_trace; ovstest test-util follow-symlinks "dir/source2"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51727,7 +51755,7 @@
 $as_echo "$at_srcdir/file_name.at:68: ovstest test-util follow-symlinks \"a\""
 at_fn_check_prepare_trace "file_name.at:68"
 ( $at_check_trace; ovstest test-util follow-symlinks "a"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51743,13 +51771,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_439
-#AT_START_440
-at_fn_group_banner 440 'file_name.at:71' \
+#AT_STOP_440
+#AT_START_441
+at_fn_group_banner 441 'file_name.at:71' \
   "follow_symlinks - symlinks to directories" "      " 30
 at_xfail=no
 (
-  $as_echo "440. $at_setup_line: testing $at_desc ..."
+  $as_echo "441. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 mkdir target
@@ -51763,7 +51791,7 @@
 $as_echo "$at_srcdir/file_name.at:76: ovstest test-util follow-symlinks \"source\""
 at_fn_check_prepare_trace "file_name.at:76"
 ( $at_check_trace; ovstest test-util follow-symlinks "source"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51780,7 +51808,7 @@
 $as_echo "$at_srcdir/file_name.at:77: ovstest test-util follow-symlinks \"source2\""
 at_fn_check_prepare_trace "file_name.at:77"
 ( $at_check_trace; ovstest test-util follow-symlinks "source2"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51800,7 +51828,7 @@
 $as_echo "$at_srcdir/file_name.at:81: ovstest test-util follow-symlinks \"source/x\""
 at_fn_check_prepare_trace "file_name.at:81"
 ( $at_check_trace; ovstest test-util follow-symlinks "source/x"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51816,13 +51844,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_440
-#AT_START_441
-at_fn_group_banner 441 'file_name.at:84' \
+#AT_STOP_441
+#AT_START_442
+at_fn_group_banner 442 'file_name.at:84' \
   "follow_symlinks - nonexistent targets" "          " 30
 at_xfail=no
 (
-  $as_echo "441. $at_setup_line: testing $at_desc ..."
+  $as_echo "442. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ln -s target source
@@ -51834,7 +51862,7 @@
 $as_echo "$at_srcdir/file_name.at:87: ovstest test-util follow-symlinks \"source\""
 at_fn_check_prepare_trace "file_name.at:87"
 ( $at_check_trace; ovstest test-util follow-symlinks "source"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51851,7 +51879,7 @@
 $as_echo "$at_srcdir/file_name.at:88: ovstest test-util follow-symlinks \"target\""
 at_fn_check_prepare_trace "file_name.at:88"
 ( $at_check_trace; ovstest test-util follow-symlinks "target"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51868,7 +51896,7 @@
 $as_echo "$at_srcdir/file_name.at:89: ovstest test-util follow-symlinks \"target\""
 at_fn_check_prepare_trace "file_name.at:89"
 ( $at_check_trace; ovstest test-util follow-symlinks "target"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51884,13 +51912,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_441
-#AT_START_442
-at_fn_group_banner 442 'file_name.at:92' \
+#AT_STOP_442
+#AT_START_443
+at_fn_group_banner 443 'file_name.at:92' \
   "follow_symlinks - regular files" "                " 30
 at_xfail=no
 (
-  $as_echo "442. $at_setup_line: testing $at_desc ..."
+  $as_echo "443. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 touch x
@@ -51899,7 +51927,7 @@
 $as_echo "$at_srcdir/file_name.at:94: ovstest test-util follow-symlinks \"x\""
 at_fn_check_prepare_trace "file_name.at:94"
 ( $at_check_trace; ovstest test-util follow-symlinks "x"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51915,13 +51943,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_442
-#AT_START_443
-at_fn_group_banner 443 'file_name.at:97' \
+#AT_STOP_443
+#AT_START_444
+at_fn_group_banner 444 'file_name.at:97' \
   "follow_symlinks - device targets" "               " 30
 at_xfail=no
 (
-  $as_echo "443. $at_setup_line: testing $at_desc ..."
+  $as_echo "444. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "file_name.at:98" >"$at_check_line_file"
@@ -51937,7 +51965,7 @@
 $as_echo "$at_srcdir/file_name.at:102: ovstest test-util follow-symlinks \"x\""
 at_fn_check_prepare_trace "file_name.at:102"
 ( $at_check_trace; ovstest test-util follow-symlinks "x"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51954,7 +51982,7 @@
 $as_echo "$at_srcdir/file_name.at:103: ovstest test-util follow-symlinks \"y\""
 at_fn_check_prepare_trace "file_name.at:103"
 ( $at_check_trace; ovstest test-util follow-symlinks "y"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -51970,13 +51998,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_443
-#AT_START_444
-at_fn_group_banner 444 'file_name.at:106' \
+#AT_STOP_444
+#AT_START_445
+at_fn_group_banner 445 'file_name.at:106' \
   "follow_symlinks - nonexistent files" "            " 30
 at_xfail=no
 (
-  $as_echo "444. $at_setup_line: testing $at_desc ..."
+  $as_echo "445. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "file_name.at:107" >"$at_check_line_file"
@@ -51987,7 +52015,7 @@
 $as_echo "$at_srcdir/file_name.at:108: ovstest test-util follow-symlinks \"nonexistent\""
 at_fn_check_prepare_trace "file_name.at:108"
 ( $at_check_trace; ovstest test-util follow-symlinks "nonexistent"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52004,7 +52032,7 @@
 $as_echo "$at_srcdir/file_name.at:109: ovstest test-util follow-symlinks \"a/b/c\""
 at_fn_check_prepare_trace "file_name.at:109"
 ( $at_check_trace; ovstest test-util follow-symlinks "a/b/c"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52021,7 +52049,7 @@
 $as_echo "$at_srcdir/file_name.at:110: ovstest test-util follow-symlinks \"/a/b/c\""
 at_fn_check_prepare_trace "file_name.at:110"
 ( $at_check_trace; ovstest test-util follow-symlinks "/a/b/c"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52038,7 +52066,7 @@
 $as_echo "$at_srcdir/file_name.at:111: ovstest test-util follow-symlinks \"//a/b/c\""
 at_fn_check_prepare_trace "file_name.at:111"
 ( $at_check_trace; ovstest test-util follow-symlinks "//a/b/c"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52054,13 +52082,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_444
-#AT_START_445
-at_fn_group_banner 445 'file_name.at:114' \
+#AT_STOP_445
+#AT_START_446
+at_fn_group_banner 446 'file_name.at:114' \
   "follow_symlinks - symlink loop" "                 " 30
 at_xfail=no
 (
-  $as_echo "445. $at_setup_line: testing $at_desc ..."
+  $as_echo "446. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ln -s a b
@@ -52076,7 +52104,7 @@
 $as_echo "$at_srcdir/file_name.at:120: ovstest test-util follow-symlinks a"
 at_fn_check_prepare_trace "file_name.at:120"
 ( $at_check_trace; ovstest test-util follow-symlinks a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -52091,7 +52119,7 @@
 $as_echo "$at_srcdir/file_name.at:122: sed 's/^[^|]*|//' stderr"
 at_fn_check_prepare_notrace 'a shell pipeline' "file_name.at:122"
 ( $at_check_trace; sed 's/^[^|]*|//' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52106,13 +52134,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_445
-#AT_START_446
-at_fn_group_banner 446 'aes128.at:10' \
+#AT_STOP_446
+#AT_START_447
+at_fn_group_banner 447 'aes128.at:10' \
   "wikipedia test vector 1" "                        " 31
 at_xfail=no
 (
-  $as_echo "446. $at_setup_line: testing $at_desc ..."
+  $as_echo "447. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52120,7 +52148,7 @@
 $as_echo "$at_srcdir/aes128.at:10: ovstest test-aes128 00010203050607080a0b0c0d0f101112 506812a45f08c889b97f5980038b8359"
 at_fn_check_prepare_trace "aes128.at:10"
 ( $at_check_trace; ovstest test-aes128 00010203050607080a0b0c0d0f101112 506812a45f08c889b97f5980038b8359
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52135,13 +52163,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_446
-#AT_START_447
-at_fn_group_banner 447 'aes128.at:16' \
+#AT_STOP_447
+#AT_START_448
+at_fn_group_banner 448 'aes128.at:16' \
   "wikipedia test vector 2" "                        " 31
 at_xfail=no
 (
-  $as_echo "447. $at_setup_line: testing $at_desc ..."
+  $as_echo "448. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52149,7 +52177,7 @@
 $as_echo "$at_srcdir/aes128.at:16: ovstest test-aes128 95A8EE8E89979B9EFDCBC6EB9797528D 4ec137a426dabf8aa0beb8bc0c2b89d6"
 at_fn_check_prepare_trace "aes128.at:16"
 ( $at_check_trace; ovstest test-aes128 95A8EE8E89979B9EFDCBC6EB9797528D 4ec137a426dabf8aa0beb8bc0c2b89d6
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52164,13 +52192,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_447
-#AT_START_448
-at_fn_group_banner 448 'aes128.at:22' \
+#AT_STOP_448
+#AT_START_449
+at_fn_group_banner 449 'aes128.at:22' \
   "NIST KAT ECBKeySbox128e vector 0" "               " 31
 at_xfail=no
 (
-  $as_echo "448. $at_setup_line: testing $at_desc ..."
+  $as_echo "449. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52178,7 +52206,7 @@
 $as_echo "$at_srcdir/aes128.at:22: ovstest test-aes128 10a58869d74be5a374cf867cfb473859 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:22"
 ( $at_check_trace; ovstest test-aes128 10a58869d74be5a374cf867cfb473859 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52193,13 +52221,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_448
-#AT_START_449
-at_fn_group_banner 449 'aes128.at:28' \
+#AT_STOP_449
+#AT_START_450
+at_fn_group_banner 450 'aes128.at:28' \
   "NIST KAT ECBKeySbox128e vector 1" "               " 31
 at_xfail=no
 (
-  $as_echo "449. $at_setup_line: testing $at_desc ..."
+  $as_echo "450. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52207,7 +52235,7 @@
 $as_echo "$at_srcdir/aes128.at:28: ovstest test-aes128 caea65cdbb75e9169ecd22ebe6e54675 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:28"
 ( $at_check_trace; ovstest test-aes128 caea65cdbb75e9169ecd22ebe6e54675 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52222,13 +52250,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_449
-#AT_START_450
-at_fn_group_banner 450 'aes128.at:34' \
+#AT_STOP_450
+#AT_START_451
+at_fn_group_banner 451 'aes128.at:34' \
   "NIST KAT ECBKeySbox128e vector 2" "               " 31
 at_xfail=no
 (
-  $as_echo "450. $at_setup_line: testing $at_desc ..."
+  $as_echo "451. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52236,7 +52264,7 @@
 $as_echo "$at_srcdir/aes128.at:34: ovstest test-aes128 a2e2fa9baf7d20822ca9f0542f764a41 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:34"
 ( $at_check_trace; ovstest test-aes128 a2e2fa9baf7d20822ca9f0542f764a41 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52251,13 +52279,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_450
-#AT_START_451
-at_fn_group_banner 451 'aes128.at:40' \
+#AT_STOP_451
+#AT_START_452
+at_fn_group_banner 452 'aes128.at:40' \
   "NIST KAT ECBKeySbox128e vector 3" "               " 31
 at_xfail=no
 (
-  $as_echo "451. $at_setup_line: testing $at_desc ..."
+  $as_echo "452. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52265,7 +52293,7 @@
 $as_echo "$at_srcdir/aes128.at:40: ovstest test-aes128 b6364ac4e1de1e285eaf144a2415f7a0 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:40"
 ( $at_check_trace; ovstest test-aes128 b6364ac4e1de1e285eaf144a2415f7a0 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52280,13 +52308,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_451
-#AT_START_452
-at_fn_group_banner 452 'aes128.at:46' \
+#AT_STOP_452
+#AT_START_453
+at_fn_group_banner 453 'aes128.at:46' \
   "NIST KAT ECBKeySbox128e vector 4" "               " 31
 at_xfail=no
 (
-  $as_echo "452. $at_setup_line: testing $at_desc ..."
+  $as_echo "453. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52294,7 +52322,7 @@
 $as_echo "$at_srcdir/aes128.at:46: ovstest test-aes128 64cf9c7abc50b888af65f49d521944b2 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:46"
 ( $at_check_trace; ovstest test-aes128 64cf9c7abc50b888af65f49d521944b2 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52309,13 +52337,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_452
-#AT_START_453
-at_fn_group_banner 453 'aes128.at:52' \
+#AT_STOP_453
+#AT_START_454
+at_fn_group_banner 454 'aes128.at:52' \
   "NIST KAT ECBKeySbox128e vector 5" "               " 31
 at_xfail=no
 (
-  $as_echo "453. $at_setup_line: testing $at_desc ..."
+  $as_echo "454. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52323,7 +52351,7 @@
 $as_echo "$at_srcdir/aes128.at:52: ovstest test-aes128 47d6742eefcc0465dc96355e851b64d9 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:52"
 ( $at_check_trace; ovstest test-aes128 47d6742eefcc0465dc96355e851b64d9 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52338,13 +52366,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_453
-#AT_START_454
-at_fn_group_banner 454 'aes128.at:58' \
+#AT_STOP_454
+#AT_START_455
+at_fn_group_banner 455 'aes128.at:58' \
   "NIST KAT ECBKeySbox128e vector 6" "               " 31
 at_xfail=no
 (
-  $as_echo "454. $at_setup_line: testing $at_desc ..."
+  $as_echo "455. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52352,7 +52380,7 @@
 $as_echo "$at_srcdir/aes128.at:58: ovstest test-aes128 3eb39790678c56bee34bbcdeccf6cdb5 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:58"
 ( $at_check_trace; ovstest test-aes128 3eb39790678c56bee34bbcdeccf6cdb5 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52367,13 +52395,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_454
-#AT_START_455
-at_fn_group_banner 455 'aes128.at:64' \
+#AT_STOP_455
+#AT_START_456
+at_fn_group_banner 456 'aes128.at:64' \
   "NIST KAT ECBKeySbox128e vector 7" "               " 31
 at_xfail=no
 (
-  $as_echo "455. $at_setup_line: testing $at_desc ..."
+  $as_echo "456. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52381,7 +52409,7 @@
 $as_echo "$at_srcdir/aes128.at:64: ovstest test-aes128 64110a924f0743d500ccadae72c13427 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:64"
 ( $at_check_trace; ovstest test-aes128 64110a924f0743d500ccadae72c13427 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52396,13 +52424,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_455
-#AT_START_456
-at_fn_group_banner 456 'aes128.at:70' \
+#AT_STOP_456
+#AT_START_457
+at_fn_group_banner 457 'aes128.at:70' \
   "NIST KAT ECBKeySbox128e vector 8" "               " 31
 at_xfail=no
 (
-  $as_echo "456. $at_setup_line: testing $at_desc ..."
+  $as_echo "457. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52410,7 +52438,7 @@
 $as_echo "$at_srcdir/aes128.at:70: ovstest test-aes128 18d8126516f8a12ab1a36d9f04d68e51 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:70"
 ( $at_check_trace; ovstest test-aes128 18d8126516f8a12ab1a36d9f04d68e51 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52425,13 +52453,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_456
-#AT_START_457
-at_fn_group_banner 457 'aes128.at:76' \
+#AT_STOP_457
+#AT_START_458
+at_fn_group_banner 458 'aes128.at:76' \
   "NIST KAT ECBKeySbox128e vector 9" "               " 31
 at_xfail=no
 (
-  $as_echo "457. $at_setup_line: testing $at_desc ..."
+  $as_echo "458. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52439,7 +52467,7 @@
 $as_echo "$at_srcdir/aes128.at:76: ovstest test-aes128 f530357968578480b398a3c251cd1093 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:76"
 ( $at_check_trace; ovstest test-aes128 f530357968578480b398a3c251cd1093 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52454,13 +52482,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_457
-#AT_START_458
-at_fn_group_banner 458 'aes128.at:82' \
+#AT_STOP_458
+#AT_START_459
+at_fn_group_banner 459 'aes128.at:82' \
   "NIST KAT ECBKeySbox128e vector 10" "              " 31
 at_xfail=no
 (
-  $as_echo "458. $at_setup_line: testing $at_desc ..."
+  $as_echo "459. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52468,7 +52496,7 @@
 $as_echo "$at_srcdir/aes128.at:82: ovstest test-aes128 da84367f325d42d601b4326964802e8e 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:82"
 ( $at_check_trace; ovstest test-aes128 da84367f325d42d601b4326964802e8e 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52483,13 +52511,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_458
-#AT_START_459
-at_fn_group_banner 459 'aes128.at:88' \
+#AT_STOP_459
+#AT_START_460
+at_fn_group_banner 460 'aes128.at:88' \
   "NIST KAT ECBKeySbox128e vector 11" "              " 31
 at_xfail=no
 (
-  $as_echo "459. $at_setup_line: testing $at_desc ..."
+  $as_echo "460. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52497,7 +52525,7 @@
 $as_echo "$at_srcdir/aes128.at:88: ovstest test-aes128 e37b1c6aa2846f6fdb413f238b089f23 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:88"
 ( $at_check_trace; ovstest test-aes128 e37b1c6aa2846f6fdb413f238b089f23 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52512,13 +52540,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_459
-#AT_START_460
-at_fn_group_banner 460 'aes128.at:94' \
+#AT_STOP_460
+#AT_START_461
+at_fn_group_banner 461 'aes128.at:94' \
   "NIST KAT ECBKeySbox128e vector 12" "              " 31
 at_xfail=no
 (
-  $as_echo "460. $at_setup_line: testing $at_desc ..."
+  $as_echo "461. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52526,7 +52554,7 @@
 $as_echo "$at_srcdir/aes128.at:94: ovstest test-aes128 6c002b682483e0cabcc731c253be5674 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:94"
 ( $at_check_trace; ovstest test-aes128 6c002b682483e0cabcc731c253be5674 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52541,13 +52569,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_460
-#AT_START_461
-at_fn_group_banner 461 'aes128.at:100' \
+#AT_STOP_461
+#AT_START_462
+at_fn_group_banner 462 'aes128.at:100' \
   "NIST KAT ECBKeySbox128e vector 13" "              " 31
 at_xfail=no
 (
-  $as_echo "461. $at_setup_line: testing $at_desc ..."
+  $as_echo "462. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52555,7 +52583,7 @@
 $as_echo "$at_srcdir/aes128.at:100: ovstest test-aes128 143ae8ed6555aba96110ab58893a8ae1 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:100"
 ( $at_check_trace; ovstest test-aes128 143ae8ed6555aba96110ab58893a8ae1 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52570,13 +52598,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_461
-#AT_START_462
-at_fn_group_banner 462 'aes128.at:106' \
+#AT_STOP_462
+#AT_START_463
+at_fn_group_banner 463 'aes128.at:106' \
   "NIST KAT ECBKeySbox128e vector 14" "              " 31
 at_xfail=no
 (
-  $as_echo "462. $at_setup_line: testing $at_desc ..."
+  $as_echo "463. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52584,7 +52612,7 @@
 $as_echo "$at_srcdir/aes128.at:106: ovstest test-aes128 b69418a85332240dc82492353956ae0c 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:106"
 ( $at_check_trace; ovstest test-aes128 b69418a85332240dc82492353956ae0c 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52599,13 +52627,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_462
-#AT_START_463
-at_fn_group_banner 463 'aes128.at:112' \
+#AT_STOP_463
+#AT_START_464
+at_fn_group_banner 464 'aes128.at:112' \
   "NIST KAT ECBKeySbox128e vector 15" "              " 31
 at_xfail=no
 (
-  $as_echo "463. $at_setup_line: testing $at_desc ..."
+  $as_echo "464. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52613,7 +52641,7 @@
 $as_echo "$at_srcdir/aes128.at:112: ovstest test-aes128 71b5c08a1993e1362e4d0ce9b22b78d5 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:112"
 ( $at_check_trace; ovstest test-aes128 71b5c08a1993e1362e4d0ce9b22b78d5 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52628,13 +52656,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_463
-#AT_START_464
-at_fn_group_banner 464 'aes128.at:118' \
+#AT_STOP_464
+#AT_START_465
+at_fn_group_banner 465 'aes128.at:118' \
   "NIST KAT ECBKeySbox128e vector 16" "              " 31
 at_xfail=no
 (
-  $as_echo "464. $at_setup_line: testing $at_desc ..."
+  $as_echo "465. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52642,7 +52670,7 @@
 $as_echo "$at_srcdir/aes128.at:118: ovstest test-aes128 e234cdca2606b81f29408d5f6da21206 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:118"
 ( $at_check_trace; ovstest test-aes128 e234cdca2606b81f29408d5f6da21206 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52657,13 +52685,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_464
-#AT_START_465
-at_fn_group_banner 465 'aes128.at:124' \
+#AT_STOP_465
+#AT_START_466
+at_fn_group_banner 466 'aes128.at:124' \
   "NIST KAT ECBKeySbox128e vector 17" "              " 31
 at_xfail=no
 (
-  $as_echo "465. $at_setup_line: testing $at_desc ..."
+  $as_echo "466. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52671,7 +52699,7 @@
 $as_echo "$at_srcdir/aes128.at:124: ovstest test-aes128 13237c49074a3da078dc1d828bb78c6f 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:124"
 ( $at_check_trace; ovstest test-aes128 13237c49074a3da078dc1d828bb78c6f 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52686,13 +52714,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_465
-#AT_START_466
-at_fn_group_banner 466 'aes128.at:130' \
+#AT_STOP_466
+#AT_START_467
+at_fn_group_banner 467 'aes128.at:130' \
   "NIST KAT ECBKeySbox128e vector 18" "              " 31
 at_xfail=no
 (
-  $as_echo "466. $at_setup_line: testing $at_desc ..."
+  $as_echo "467. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52700,7 +52728,7 @@
 $as_echo "$at_srcdir/aes128.at:130: ovstest test-aes128 3071a2a48fe6cbd04f1a129098e308f8 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:130"
 ( $at_check_trace; ovstest test-aes128 3071a2a48fe6cbd04f1a129098e308f8 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52715,13 +52743,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_466
-#AT_START_467
-at_fn_group_banner 467 'aes128.at:136' \
+#AT_STOP_467
+#AT_START_468
+at_fn_group_banner 468 'aes128.at:136' \
   "NIST KAT ECBKeySbox128e vector 19" "              " 31
 at_xfail=no
 (
-  $as_echo "467. $at_setup_line: testing $at_desc ..."
+  $as_echo "468. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52729,7 +52757,7 @@
 $as_echo "$at_srcdir/aes128.at:136: ovstest test-aes128 90f42ec0f68385f2ffc5dfc03a654dce 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:136"
 ( $at_check_trace; ovstest test-aes128 90f42ec0f68385f2ffc5dfc03a654dce 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52744,13 +52772,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_467
-#AT_START_468
-at_fn_group_banner 468 'aes128.at:142' \
+#AT_STOP_468
+#AT_START_469
+at_fn_group_banner 469 'aes128.at:142' \
   "NIST KAT ECBKeySbox128e vector 20" "              " 31
 at_xfail=no
 (
-  $as_echo "468. $at_setup_line: testing $at_desc ..."
+  $as_echo "469. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -52758,7 +52786,7 @@
 $as_echo "$at_srcdir/aes128.at:142: ovstest test-aes128 febd9a24d8b65c1c787d50a4ed3619a9 00000000000000000000000000000000"
 at_fn_check_prepare_trace "aes128.at:142"
 ( $at_check_trace; ovstest test-aes128 febd9a24d8b65c1c787d50a4ed3619a9 00000000000000000000000000000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52773,13 +52801,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_468
-#AT_START_469
-at_fn_group_banner 469 'unixctl-py.at:6' \
+#AT_STOP_469
+#AT_START_470
+at_fn_group_banner 470 'unixctl-py.at:6' \
   "unixctl ovs-vswitchd exit - Python" "             " 32
 at_xfail=no
 (
-  $as_echo "469. $at_setup_line: testing $at_desc ..."
+  $as_echo "470. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "unixctl-py.at:7" >"$at_check_line_file"
@@ -52795,7 +52823,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:8: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "unixctl-py.at:8"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52809,7 +52837,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:8: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "unixctl-py.at:8"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -52831,7 +52859,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52846,7 +52874,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:8: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "unixctl-py.at:8"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52861,7 +52889,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:8: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "unixctl-py.at:8"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -52893,7 +52921,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52910,7 +52938,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:8: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "unixctl-py.at:8"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52927,7 +52955,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:10: \$PYTHON \$srcdir/appctl.py --timeout 20 -t ovs-vswitchd exit"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 -t ovs-vswitchd exit" "unixctl-py.at:10"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52946,7 +52974,7 @@
 ( $at_check_trace; ovs_wait_cond () { if test -s ovs-vswitchd.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -52962,7 +52990,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:13: \$PYTHON \$srcdir/appctl.py --timeout 20 -t ovsdb-server exit"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 -t ovsdb-server exit" "unixctl-py.at:13"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -52981,7 +53009,7 @@
 ( $at_check_trace; ovs_wait_cond () { if test -s ovsdb-server.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -52996,13 +53024,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_469
-#AT_START_470
-at_fn_group_banner 470 'unixctl-py.at:17' \
+#AT_STOP_470
+#AT_START_471
+at_fn_group_banner 471 'unixctl-py.at:17' \
   "unixctl ovs-vswitchd list-commands - Python" "    " 32
 at_xfail=no
 (
-  $as_echo "470. $at_setup_line: testing $at_desc ..."
+  $as_echo "471. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "unixctl-py.at:18" >"$at_check_line_file"
@@ -53018,7 +53046,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:19: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "unixctl-py.at:19"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53032,7 +53060,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:19: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "unixctl-py.at:19"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -53054,7 +53082,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53069,7 +53097,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:19: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "unixctl-py.at:19"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53084,7 +53112,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:19: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "unixctl-py.at:19"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -53116,7 +53144,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53133,7 +53161,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:19: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "unixctl-py.at:19"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53150,7 +53178,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:21: ovs-appctl --timeout 20 list-commands"
 at_fn_check_prepare_trace "unixctl-py.at:21"
 ( $at_check_trace; ovs-appctl --timeout 20 list-commands
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53165,7 +53193,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:22: head -1 stdout"
 at_fn_check_prepare_trace "unixctl-py.at:22"
 ( $at_check_trace; head -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53183,7 +53211,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:26: \$PYTHON \$srcdir/appctl.py --timeout 20 list-commands"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 list-commands" "unixctl-py.at:26"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 list-commands
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53199,7 +53227,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:28: check_logs "
 at_fn_check_prepare_trace "unixctl-py.at:28"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53214,7 +53242,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:28: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "unixctl-py.at:28"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53229,7 +53257,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:28: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "unixctl-py.at:28"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53244,13 +53272,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_470
-#AT_START_471
-at_fn_group_banner 471 'unixctl-py.at:32' \
+#AT_STOP_471
+#AT_START_472
+at_fn_group_banner 472 'unixctl-py.at:32' \
   "unixctl ovs-vswitchd arguments - Python" "        " 32
 at_xfail=no
 (
-  $as_echo "471. $at_setup_line: testing $at_desc ..."
+  $as_echo "472. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "unixctl-py.at:33" >"$at_check_line_file"
@@ -53266,7 +53294,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:34: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "unixctl-py.at:34"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53280,7 +53308,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:34: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "unixctl-py.at:34"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -53302,7 +53330,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53317,7 +53345,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:34: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "unixctl-py.at:34"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53332,7 +53360,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:34: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "unixctl-py.at:34"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -53364,7 +53392,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53381,7 +53409,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:34: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "unixctl-py.at:34"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53398,7 +53426,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:36: ovs-appctl --timeout 20 bond/hash"
 at_fn_check_prepare_trace "unixctl-py.at:36"
 ( $at_check_trace; ovs-appctl --timeout 20 bond/hash
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -53413,7 +53441,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:37: head -1 stderr"
 at_fn_check_prepare_trace "unixctl-py.at:37"
 ( $at_check_trace; head -1 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53431,7 +53459,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:41: \$PYTHON \$srcdir/appctl.py --timeout 20 bond/hash"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 bond/hash" "unixctl-py.at:41"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 bond/hash
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -53447,7 +53475,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:43: ovs-appctl --timeout 20 bond/hash mac"
 at_fn_check_prepare_trace "unixctl-py.at:43"
 ( $at_check_trace; ovs-appctl --timeout 20 bond/hash mac
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -53462,7 +53490,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:44: head -1 stderr"
 at_fn_check_prepare_trace "unixctl-py.at:44"
 ( $at_check_trace; head -1 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53480,7 +53508,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:48: \$PYTHON \$srcdir/appctl.py --timeout 20 bond/hash mac"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 bond/hash mac" "unixctl-py.at:48"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 bond/hash mac
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -53496,7 +53524,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:50: ovs-appctl --timeout 20 bond/hash mac vlan"
 at_fn_check_prepare_trace "unixctl-py.at:50"
 ( $at_check_trace; ovs-appctl --timeout 20 bond/hash mac vlan
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -53511,7 +53539,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:51: head -1 stderr"
 at_fn_check_prepare_trace "unixctl-py.at:51"
 ( $at_check_trace; head -1 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53529,7 +53557,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:55: \$PYTHON \$srcdir/appctl.py --timeout 20 bond/hash mac vlan"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 bond/hash mac vlan" "unixctl-py.at:55"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 bond/hash mac vlan
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -53545,7 +53573,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:57: ovs-appctl --timeout 20 bond/hash mac vlan basis"
 at_fn_check_prepare_trace "unixctl-py.at:57"
 ( $at_check_trace; ovs-appctl --timeout 20 bond/hash mac vlan basis
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -53560,7 +53588,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:58: head -1 stderr"
 at_fn_check_prepare_trace "unixctl-py.at:58"
 ( $at_check_trace; head -1 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53578,7 +53606,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:62: \$PYTHON \$srcdir/appctl.py --timeout 20 bond/hash vlan basis"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 bond/hash vlan basis" "unixctl-py.at:62"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 bond/hash vlan basis
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -53594,7 +53622,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:64: ovs-appctl --timeout 20 bond/hash mac vlan basis extra"
 at_fn_check_prepare_trace "unixctl-py.at:64"
 ( $at_check_trace; ovs-appctl --timeout 20 bond/hash mac vlan basis extra
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -53609,7 +53637,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:65: head -1 stderr"
 at_fn_check_prepare_trace "unixctl-py.at:65"
 ( $at_check_trace; head -1 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53627,7 +53655,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:69: \$PYTHON \$srcdir/appctl.py --timeout 20 bond/hash mac vlan basis extra"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 bond/hash mac vlan basis extra" "unixctl-py.at:69"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 bond/hash mac vlan basis extra
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -53643,7 +53671,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:71: check_logs "
 at_fn_check_prepare_trace "unixctl-py.at:71"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53658,7 +53686,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:71: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "unixctl-py.at:71"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53673,7 +53701,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:71: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "unixctl-py.at:71"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53688,13 +53716,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_471
-#AT_START_472
-at_fn_group_banner 472 'unixctl-py.at:74' \
+#AT_STOP_472
+#AT_START_473
+at_fn_group_banner 473 'unixctl-py.at:74' \
   "unixctl bad target - Python" "                    " 32
 at_xfail=no
 (
-  $as_echo "472. $at_setup_line: testing $at_desc ..."
+  $as_echo "473. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -53707,7 +53735,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:79: \$PYTHON \$srcdir/appctl.py --timeout 20 -t bogus doit"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 -t bogus doit" "unixctl-py.at:79"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 -t bogus doit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -53720,7 +53748,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:80: tail -1 stderr"
 at_fn_check_prepare_trace "unixctl-py.at:80"
 ( $at_check_trace; tail -1 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53736,7 +53764,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:84: \$PYTHON \$srcdir/appctl.py --timeout 20 -t /bogus/path.pid doit"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 -t /bogus/path.pid doit" "unixctl-py.at:84"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 -t /bogus/path.pid doit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -53749,7 +53777,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:85: tail -1 stderr"
 at_fn_check_prepare_trace "unixctl-py.at:85"
 ( $at_check_trace; tail -1 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53765,13 +53793,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_472
-#AT_START_473
-at_fn_group_banner 473 'unixctl-py.at:91' \
+#AT_STOP_473
+#AT_START_474
+at_fn_group_banner 474 'unixctl-py.at:91' \
   "unixctl server - Python" "                        " 32
 at_xfail=no
 (
-  $as_echo "473. $at_setup_line: testing $at_desc ..."
+  $as_echo "474. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "unixctl-py.at:92" >"$at_check_line_file"
@@ -53791,7 +53819,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:99: \$PYTHON \$srcdir/test-unixctl.py --log-file --pidfile --detach"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-unixctl.py --log-file --pidfile --detach" "unixctl-py.at:99"
 ( $at_check_trace; $PYTHON $srcdir/test-unixctl.py --log-file --pidfile --detach
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53806,7 +53834,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:101: ovs-appctl --timeout 20 -t test-unixctl.py help"
 at_fn_check_prepare_trace "unixctl-py.at:101"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py help
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53820,7 +53848,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:102: cat stdout"
 at_fn_check_prepare_trace "unixctl-py.at:102"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53847,7 +53875,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:116: \$PYTHON \$srcdir/appctl.py --timeout 20 -t test-unixctl.py help"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py help" "unixctl-py.at:116"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py help
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53862,7 +53890,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:118: ovs-vsctl --version | sed 's/ovs-vsctl/test-unixctl.py/' | head -1 > expout"
 at_fn_check_prepare_notrace 'a shell pipeline' "unixctl-py.at:118"
 ( $at_check_trace; ovs-vsctl --version | sed 's/ovs-vsctl/test-unixctl.py/' | head -1 > expout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53876,7 +53904,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:119: ovs-appctl --timeout 20 -t test-unixctl.py version"
 at_fn_check_prepare_trace "unixctl-py.at:119"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py version
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53890,7 +53918,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:120: \$PYTHON \$srcdir/appctl.py --timeout 20 -t test-unixctl.py version"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py version" "unixctl-py.at:120"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py version
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53905,7 +53933,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:122: ovs-appctl --timeout 20 -t test-unixctl.py echo robot ninja"
 at_fn_check_prepare_trace "unixctl-py.at:122"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py echo robot ninja
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53919,7 +53947,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:123: cat stdout"
 at_fn_check_prepare_trace "unixctl-py.at:123"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53936,7 +53964,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:127: \$PYTHON \$srcdir/appctl.py --timeout 20 -t test-unixctl.py echo robot ninja"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py echo robot ninja" "unixctl-py.at:127"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py echo robot ninja
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53951,7 +53979,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:129: ovs-appctl --timeout 20 -t test-unixctl.py echo_error robot ninja"
 at_fn_check_prepare_trace "unixctl-py.at:129"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py echo_error robot ninja
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -53965,7 +53993,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:130: cat stderr"
 at_fn_check_prepare_trace "unixctl-py.at:130"
 ( $at_check_trace; cat stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -53983,7 +54011,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:135: \$PYTHON \$srcdir/appctl.py --timeout 20 -t test-unixctl.py echo_error robot ninja"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py echo_error robot ninja" "unixctl-py.at:135"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py echo_error robot ninja
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -53998,7 +54026,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:137: ovs-appctl --timeout 20 -t test-unixctl.py echo"
 at_fn_check_prepare_trace "unixctl-py.at:137"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py echo
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -54012,7 +54040,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:138: cat stderr"
 at_fn_check_prepare_trace "unixctl-py.at:138"
 ( $at_check_trace; cat stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54030,7 +54058,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:143: \$PYTHON \$srcdir/appctl.py --timeout 20 -t test-unixctl.py echo"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py echo" "unixctl-py.at:143"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py echo
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -54045,7 +54073,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:145: ovs-appctl --timeout 20 -t test-unixctl.py echo robot ninja pirates"
 at_fn_check_prepare_trace "unixctl-py.at:145"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py echo robot ninja pirates
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -54059,7 +54087,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:146: cat stderr"
 at_fn_check_prepare_trace "unixctl-py.at:146"
 ( $at_check_trace; cat stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54077,7 +54105,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:151: \$PYTHON \$srcdir/appctl.py --timeout 20 -t test-unixctl.py echo robot ninja pirates"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py echo robot ninja pirates" "unixctl-py.at:151"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py echo robot ninja pirates
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -54092,7 +54120,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:153: ovs-appctl --timeout 20 -t test-unixctl.py bogus"
 at_fn_check_prepare_trace "unixctl-py.at:153"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py bogus
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -54106,7 +54134,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:154: cat stderr"
 at_fn_check_prepare_trace "unixctl-py.at:154"
 ( $at_check_trace; cat stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54124,7 +54152,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:159: \$PYTHON \$srcdir/appctl.py --timeout 20 -t test-unixctl.py bogus"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py bogus" "unixctl-py.at:159"
 ( $at_check_trace; $PYTHON $srcdir/appctl.py --timeout 20 -t test-unixctl.py bogus
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
@@ -54139,7 +54167,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:161: ovs-appctl --timeout 20 -t test-unixctl.py exit"
 at_fn_check_prepare_trace "unixctl-py.at:161"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54153,13 +54181,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_473
-#AT_START_474
-at_fn_group_banner 474 'unixctl-py.at:165' \
+#AT_STOP_474
+#AT_START_475
+at_fn_group_banner 475 'unixctl-py.at:165' \
   "unixctl server errors - Python" "                 " 32
 at_xfail=no
 (
-  $as_echo "474. $at_setup_line: testing $at_desc ..."
+  $as_echo "475. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "unixctl-py.at:166" >"$at_check_line_file"
@@ -54169,7 +54197,7 @@
 $as_echo "$at_srcdir/unixctl-py.at:167: \$PYTHON \$srcdir/test-unixctl.py --unixctl \"\`pwd\`\"/bogus/path"
 at_fn_check_prepare_notrace 'a `...` command substitution' "unixctl-py.at:167"
 ( $at_check_trace; $PYTHON $srcdir/test-unixctl.py --unixctl "`pwd`"/bogus/path
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -54182,13 +54210,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_474
-#AT_START_475
-at_fn_group_banner 475 'uuid.at:15' \
+#AT_STOP_475
+#AT_START_476
+at_fn_group_banner 476 'uuid.at:15' \
   "UUID generation, parsing, serialization" "        " 33
 at_xfail=no
 (
-  $as_echo "475. $at_setup_line: testing $at_desc ..."
+  $as_echo "476. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54250,7 +54278,7 @@
        exit 1
      fi
    done
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54263,13 +54291,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_475
-#AT_START_476
-at_fn_group_banner 476 'json.at:65' \
+#AT_STOP_476
+#AT_START_477
+at_fn_group_banner 477 'json.at:65' \
   "empty array - C" "                                " 34
 at_xfail=no
 (
-  $as_echo "476. $at_setup_line: testing $at_desc ..."
+  $as_echo "477. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54277,7 +54305,7 @@
 $as_echo "$at_srcdir/json.at:65: printf %s \" [   ] \" > input"
 at_fn_check_prepare_trace "json.at:65"
 ( $at_check_trace; printf %s " [   ] " > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54291,7 +54319,7 @@
 $as_echo "$at_srcdir/json.at:65: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:65"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54305,7 +54333,7 @@
 $as_echo "$at_srcdir/json.at:65: cat stdout"
 at_fn_check_prepare_trace "json.at:65"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54321,13 +54349,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_476
-#AT_START_477
-at_fn_group_banner 477 'json.at:65' \
+#AT_STOP_477
+#AT_START_478
+at_fn_group_banner 478 'json.at:65' \
   "empty array - Python" "                           " 34
 at_xfail=no
 (
-  $as_echo "477. $at_setup_line: testing $at_desc ..."
+  $as_echo "478. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54338,7 +54366,7 @@
 $as_echo "$at_srcdir/json.at:65: printf %s \" [   ] \" > input"
 at_fn_check_prepare_trace "json.at:65"
 ( $at_check_trace; printf %s " [   ] " > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54352,7 +54380,7 @@
 $as_echo "$at_srcdir/json.at:65: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:65"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54366,7 +54394,7 @@
 $as_echo "$at_srcdir/json.at:65: cat stdout"
 at_fn_check_prepare_trace "json.at:65"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54382,13 +54410,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_477
-#AT_START_478
-at_fn_group_banner 478 'json.at:66' \
+#AT_STOP_478
+#AT_START_479
+at_fn_group_banner 479 'json.at:66' \
   "single-element array - C" "                       " 34
 at_xfail=no
 (
-  $as_echo "478. $at_setup_line: testing $at_desc ..."
+  $as_echo "479. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54396,7 +54424,7 @@
 $as_echo "$at_srcdir/json.at:66: printf %s \" [ 1 ] \" > input"
 at_fn_check_prepare_trace "json.at:66"
 ( $at_check_trace; printf %s " [ 1 ] " > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54410,7 +54438,7 @@
 $as_echo "$at_srcdir/json.at:66: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:66"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54424,7 +54452,7 @@
 $as_echo "$at_srcdir/json.at:66: cat stdout"
 at_fn_check_prepare_trace "json.at:66"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54440,13 +54468,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_478
-#AT_START_479
-at_fn_group_banner 479 'json.at:66' \
+#AT_STOP_479
+#AT_START_480
+at_fn_group_banner 480 'json.at:66' \
   "single-element array - Python" "                  " 34
 at_xfail=no
 (
-  $as_echo "479. $at_setup_line: testing $at_desc ..."
+  $as_echo "480. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54457,7 +54485,7 @@
 $as_echo "$at_srcdir/json.at:66: printf %s \" [ 1 ] \" > input"
 at_fn_check_prepare_trace "json.at:66"
 ( $at_check_trace; printf %s " [ 1 ] " > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54471,7 +54499,7 @@
 $as_echo "$at_srcdir/json.at:66: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:66"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54485,7 +54513,7 @@
 $as_echo "$at_srcdir/json.at:66: cat stdout"
 at_fn_check_prepare_trace "json.at:66"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54501,13 +54529,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_479
-#AT_START_480
-at_fn_group_banner 480 'json.at:67' \
+#AT_STOP_480
+#AT_START_481
+at_fn_group_banner 481 'json.at:67' \
   "2-element array - C" "                            " 34
 at_xfail=no
 (
-  $as_echo "480. $at_setup_line: testing $at_desc ..."
+  $as_echo "481. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54515,7 +54543,7 @@
 $as_echo "$at_srcdir/json.at:67: printf %s \" [ 1, 2 ] \" > input"
 at_fn_check_prepare_trace "json.at:67"
 ( $at_check_trace; printf %s " [ 1, 2 ] " > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54529,7 +54557,7 @@
 $as_echo "$at_srcdir/json.at:67: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:67"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54543,7 +54571,7 @@
 $as_echo "$at_srcdir/json.at:67: cat stdout"
 at_fn_check_prepare_trace "json.at:67"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54559,13 +54587,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_480
-#AT_START_481
-at_fn_group_banner 481 'json.at:67' \
+#AT_STOP_481
+#AT_START_482
+at_fn_group_banner 482 'json.at:67' \
   "2-element array - Python" "                       " 34
 at_xfail=no
 (
-  $as_echo "481. $at_setup_line: testing $at_desc ..."
+  $as_echo "482. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54576,7 +54604,7 @@
 $as_echo "$at_srcdir/json.at:67: printf %s \" [ 1, 2 ] \" > input"
 at_fn_check_prepare_trace "json.at:67"
 ( $at_check_trace; printf %s " [ 1, 2 ] " > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54590,7 +54618,7 @@
 $as_echo "$at_srcdir/json.at:67: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:67"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54604,7 +54632,7 @@
 $as_echo "$at_srcdir/json.at:67: cat stdout"
 at_fn_check_prepare_trace "json.at:67"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54620,13 +54648,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_481
-#AT_START_482
-at_fn_group_banner 482 'json.at:68' \
+#AT_STOP_482
+#AT_START_483
+at_fn_group_banner 483 'json.at:68' \
   "many-element array - C" "                         " 34
 at_xfail=no
 (
-  $as_echo "482. $at_setup_line: testing $at_desc ..."
+  $as_echo "483. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54634,7 +54662,7 @@
 $as_echo "$at_srcdir/json.at:68: printf %s \" [ 1, 2, 3, 4, 5 ] \" > input"
 at_fn_check_prepare_trace "json.at:68"
 ( $at_check_trace; printf %s " [ 1, 2, 3, 4, 5 ] " > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54648,7 +54676,7 @@
 $as_echo "$at_srcdir/json.at:68: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:68"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54662,7 +54690,7 @@
 $as_echo "$at_srcdir/json.at:68: cat stdout"
 at_fn_check_prepare_trace "json.at:68"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54678,13 +54706,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_482
-#AT_START_483
-at_fn_group_banner 483 'json.at:68' \
+#AT_STOP_483
+#AT_START_484
+at_fn_group_banner 484 'json.at:68' \
   "many-element array - Python" "                    " 34
 at_xfail=no
 (
-  $as_echo "483. $at_setup_line: testing $at_desc ..."
+  $as_echo "484. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54695,7 +54723,7 @@
 $as_echo "$at_srcdir/json.at:68: printf %s \" [ 1, 2, 3, 4, 5 ] \" > input"
 at_fn_check_prepare_trace "json.at:68"
 ( $at_check_trace; printf %s " [ 1, 2, 3, 4, 5 ] " > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54709,7 +54737,7 @@
 $as_echo "$at_srcdir/json.at:68: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:68"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54723,7 +54751,7 @@
 $as_echo "$at_srcdir/json.at:68: cat stdout"
 at_fn_check_prepare_trace "json.at:68"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54739,13 +54767,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_483
-#AT_START_484
-at_fn_group_banner 484 'json.at:71' \
+#AT_STOP_484
+#AT_START_485
+at_fn_group_banner 485 'json.at:71' \
   "missing comma - C" "                              " 34
 at_xfail=no
 (
-  $as_echo "484. $at_setup_line: testing $at_desc ..."
+  $as_echo "485. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54753,7 +54781,7 @@
 $as_echo "$at_srcdir/json.at:71: printf %s \" [ 1, 2, 3 4, 5 ] \" > input"
 at_fn_check_prepare_trace "json.at:71"
 ( $at_check_trace; printf %s " [ 1, 2, 3 4, 5 ] " > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54767,7 +54795,7 @@
 $as_echo "$at_srcdir/json.at:71: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:71"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54781,7 +54809,7 @@
 $as_echo "$at_srcdir/json.at:71: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:71"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54797,13 +54825,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_484
-#AT_START_485
-at_fn_group_banner 485 'json.at:71' \
+#AT_STOP_485
+#AT_START_486
+at_fn_group_banner 486 'json.at:71' \
   "missing comma - Python" "                         " 34
 at_xfail=no
 (
-  $as_echo "485. $at_setup_line: testing $at_desc ..."
+  $as_echo "486. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54814,7 +54842,7 @@
 $as_echo "$at_srcdir/json.at:71: printf %s \" [ 1, 2, 3 4, 5 ] \" > input"
 at_fn_check_prepare_trace "json.at:71"
 ( $at_check_trace; printf %s " [ 1, 2, 3 4, 5 ] " > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54828,7 +54856,7 @@
 $as_echo "$at_srcdir/json.at:71: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:71"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54842,7 +54870,7 @@
 $as_echo "$at_srcdir/json.at:71: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:71"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54858,13 +54886,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_485
-#AT_START_486
-at_fn_group_banner 486 'json.at:73' \
+#AT_STOP_486
+#AT_START_487
+at_fn_group_banner 487 'json.at:73' \
   "trailing comma not allowed - C" "                 " 34
 at_xfail=no
 (
-  $as_echo "486. $at_setup_line: testing $at_desc ..."
+  $as_echo "487. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54872,7 +54900,7 @@
 $as_echo "$at_srcdir/json.at:73: printf %s \"[1,2,]\" > input"
 at_fn_check_prepare_trace "json.at:73"
 ( $at_check_trace; printf %s "[1,2,]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54886,7 +54914,7 @@
 $as_echo "$at_srcdir/json.at:73: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:73"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54900,7 +54928,7 @@
 $as_echo "$at_srcdir/json.at:73: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:73"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54916,13 +54944,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_486
-#AT_START_487
-at_fn_group_banner 487 'json.at:73' \
+#AT_STOP_487
+#AT_START_488
+at_fn_group_banner 488 'json.at:73' \
   "trailing comma not allowed - Python" "            " 34
 at_xfail=no
 (
-  $as_echo "487. $at_setup_line: testing $at_desc ..."
+  $as_echo "488. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54933,7 +54961,7 @@
 $as_echo "$at_srcdir/json.at:73: printf %s \"[1,2,]\" > input"
 at_fn_check_prepare_trace "json.at:73"
 ( $at_check_trace; printf %s "[1,2,]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54947,7 +54975,7 @@
 $as_echo "$at_srcdir/json.at:73: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:73"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54961,7 +54989,7 @@
 $as_echo "$at_srcdir/json.at:73: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:73"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -54977,13 +55005,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_487
-#AT_START_488
-at_fn_group_banner 488 'json.at:75' \
+#AT_STOP_488
+#AT_START_489
+at_fn_group_banner 489 'json.at:75' \
   "doubled comma not allowed - C" "                  " 34
 at_xfail=no
 (
-  $as_echo "488. $at_setup_line: testing $at_desc ..."
+  $as_echo "489. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -54991,7 +55019,7 @@
 $as_echo "$at_srcdir/json.at:75: printf %s \"[1,,2]\" > input"
 at_fn_check_prepare_trace "json.at:75"
 ( $at_check_trace; printf %s "[1,,2]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55005,7 +55033,7 @@
 $as_echo "$at_srcdir/json.at:75: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:75"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55019,7 +55047,7 @@
 $as_echo "$at_srcdir/json.at:75: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:75"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55035,13 +55063,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_488
-#AT_START_489
-at_fn_group_banner 489 'json.at:75' \
+#AT_STOP_489
+#AT_START_490
+at_fn_group_banner 490 'json.at:75' \
   "doubled comma not allowed - Python" "             " 34
 at_xfail=no
 (
-  $as_echo "489. $at_setup_line: testing $at_desc ..."
+  $as_echo "490. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55052,7 +55080,7 @@
 $as_echo "$at_srcdir/json.at:75: printf %s \"[1,,2]\" > input"
 at_fn_check_prepare_trace "json.at:75"
 ( $at_check_trace; printf %s "[1,,2]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55066,7 +55094,7 @@
 $as_echo "$at_srcdir/json.at:75: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:75"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55080,7 +55108,7 @@
 $as_echo "$at_srcdir/json.at:75: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:75"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55096,13 +55124,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_489
-#AT_START_490
-at_fn_group_banner 490 'json.at:80' \
+#AT_STOP_490
+#AT_START_491
+at_fn_group_banner 491 'json.at:80' \
   "empty string - C" "                               " 35
 at_xfail=no
 (
-  $as_echo "490. $at_setup_line: testing $at_desc ..."
+  $as_echo "491. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55110,7 +55138,7 @@
 $as_echo "$at_srcdir/json.at:80: printf %s \"[ \\\"\\\" ]\" > input"
 at_fn_check_prepare_trace "json.at:80"
 ( $at_check_trace; printf %s "[ \"\" ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55124,7 +55152,7 @@
 $as_echo "$at_srcdir/json.at:80: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:80"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55138,7 +55166,7 @@
 $as_echo "$at_srcdir/json.at:80: cat stdout"
 at_fn_check_prepare_trace "json.at:80"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55154,13 +55182,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_490
-#AT_START_491
-at_fn_group_banner 491 'json.at:80' \
+#AT_STOP_491
+#AT_START_492
+at_fn_group_banner 492 'json.at:80' \
   "empty string - Python" "                          " 35
 at_xfail=no
 (
-  $as_echo "491. $at_setup_line: testing $at_desc ..."
+  $as_echo "492. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55171,7 +55199,7 @@
 $as_echo "$at_srcdir/json.at:80: printf %s \"[ \\\"\\\" ]\" > input"
 at_fn_check_prepare_trace "json.at:80"
 ( $at_check_trace; printf %s "[ \"\" ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55185,7 +55213,7 @@
 $as_echo "$at_srcdir/json.at:80: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:80"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55199,7 +55227,7 @@
 $as_echo "$at_srcdir/json.at:80: cat stdout"
 at_fn_check_prepare_trace "json.at:80"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55215,13 +55243,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_491
-#AT_START_492
-at_fn_group_banner 492 'json.at:81' \
+#AT_STOP_492
+#AT_START_493
+at_fn_group_banner 493 'json.at:81' \
   "1-character strings - C" "                        " 35
 at_xfail=no
 (
-  $as_echo "492. $at_setup_line: testing $at_desc ..."
+  $as_echo "493. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55229,7 +55257,7 @@
 $as_echo "$at_srcdir/json.at:81: printf %s \"[ \\\"a\\\", \\\"b\\\", \\\"c\\\" ]\" > input"
 at_fn_check_prepare_trace "json.at:81"
 ( $at_check_trace; printf %s "[ \"a\", \"b\", \"c\" ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55243,7 +55271,7 @@
 $as_echo "$at_srcdir/json.at:81: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:81"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55257,7 +55285,7 @@
 $as_echo "$at_srcdir/json.at:81: cat stdout"
 at_fn_check_prepare_trace "json.at:81"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55273,13 +55301,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_492
-#AT_START_493
-at_fn_group_banner 493 'json.at:81' \
+#AT_STOP_493
+#AT_START_494
+at_fn_group_banner 494 'json.at:81' \
   "1-character strings - Python" "                   " 35
 at_xfail=no
 (
-  $as_echo "493. $at_setup_line: testing $at_desc ..."
+  $as_echo "494. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55290,7 +55318,7 @@
 $as_echo "$at_srcdir/json.at:81: printf %s \"[ \\\"a\\\", \\\"b\\\", \\\"c\\\" ]\" > input"
 at_fn_check_prepare_trace "json.at:81"
 ( $at_check_trace; printf %s "[ \"a\", \"b\", \"c\" ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55304,7 +55332,7 @@
 $as_echo "$at_srcdir/json.at:81: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:81"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55318,7 +55346,7 @@
 $as_echo "$at_srcdir/json.at:81: cat stdout"
 at_fn_check_prepare_trace "json.at:81"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55334,13 +55362,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_493
-#AT_START_494
-at_fn_group_banner 494 'json.at:84' \
+#AT_STOP_494
+#AT_START_495
+at_fn_group_banner 495 'json.at:84' \
   "escape sequences - C" "                           " 35
 at_xfail=no
 (
-  $as_echo "494. $at_setup_line: testing $at_desc ..."
+  $as_echo "495. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55348,7 +55376,7 @@
 $as_echo "$at_srcdir/json.at:84: printf %s \"[ \\\" \\\\\\\" \\\\\\\\ \\\\/ \\\\b \\\\f \\\\n \\\\r \\\\t\\\" ]\" > input"
 at_fn_check_prepare_trace "json.at:84"
 ( $at_check_trace; printf %s "[ \" \\\" \\\\ \\/ \\b \\f \\n \\r \\t\" ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55362,7 +55390,7 @@
 $as_echo "$at_srcdir/json.at:84: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:84"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55376,7 +55404,7 @@
 $as_echo "$at_srcdir/json.at:84: cat stdout"
 at_fn_check_prepare_trace "json.at:84"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55392,13 +55420,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_494
-#AT_START_495
-at_fn_group_banner 495 'json.at:84' \
+#AT_STOP_495
+#AT_START_496
+at_fn_group_banner 496 'json.at:84' \
   "escape sequences - Python" "                      " 35
 at_xfail=no
 (
-  $as_echo "495. $at_setup_line: testing $at_desc ..."
+  $as_echo "496. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55409,7 +55437,7 @@
 $as_echo "$at_srcdir/json.at:84: printf %s \"[ \\\" \\\\\\\" \\\\\\\\ \\\\/ \\\\b \\\\f \\\\n \\\\r \\\\t\\\" ]\" > input"
 at_fn_check_prepare_trace "json.at:84"
 ( $at_check_trace; printf %s "[ \" \\\" \\\\ \\/ \\b \\f \\n \\r \\t\" ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55423,7 +55451,7 @@
 $as_echo "$at_srcdir/json.at:84: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:84"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55437,7 +55465,7 @@
 $as_echo "$at_srcdir/json.at:84: cat stdout"
 at_fn_check_prepare_trace "json.at:84"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55453,13 +55481,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_495
-#AT_START_496
-at_fn_group_banner 496 'json.at:87' \
+#AT_STOP_496
+#AT_START_497
+at_fn_group_banner 497 'json.at:87' \
   "Unicode escape sequences - C" "                   " 35
 at_xfail=no
 (
-  $as_echo "496. $at_setup_line: testing $at_desc ..."
+  $as_echo "497. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55467,7 +55495,7 @@
 $as_echo "$at_srcdir/json.at:87: printf %s \"[ \\\" \\\\u0022 \\\\u005c \\\\u002F \\\\u0008 \\\\u000c \\\\u000A \\\\u000d \\\\u0009\\\" ]\" > input"
 at_fn_check_prepare_trace "json.at:87"
 ( $at_check_trace; printf %s "[ \" \\u0022 \\u005c \\u002F \\u0008 \\u000c \\u000A \\u000d \\u0009\" ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55481,7 +55509,7 @@
 $as_echo "$at_srcdir/json.at:87: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:87"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55495,7 +55523,7 @@
 $as_echo "$at_srcdir/json.at:87: cat stdout"
 at_fn_check_prepare_trace "json.at:87"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55511,13 +55539,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_496
-#AT_START_497
-at_fn_group_banner 497 'json.at:87' \
+#AT_STOP_497
+#AT_START_498
+at_fn_group_banner 498 'json.at:87' \
   "Unicode escape sequences - Python" "              " 35
 at_xfail=no
 (
-  $as_echo "497. $at_setup_line: testing $at_desc ..."
+  $as_echo "498. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55528,7 +55556,7 @@
 $as_echo "$at_srcdir/json.at:87: printf %s \"[ \\\" \\\\u0022 \\\\u005c \\\\u002F \\\\u0008 \\\\u000c \\\\u000A \\\\u000d \\\\u0009\\\" ]\" > input"
 at_fn_check_prepare_trace "json.at:87"
 ( $at_check_trace; printf %s "[ \" \\u0022 \\u005c \\u002F \\u0008 \\u000c \\u000A \\u000d \\u0009\" ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55542,7 +55570,7 @@
 $as_echo "$at_srcdir/json.at:87: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:87"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55556,7 +55584,7 @@
 $as_echo "$at_srcdir/json.at:87: cat stdout"
 at_fn_check_prepare_trace "json.at:87"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55572,13 +55600,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_497
-#AT_START_498
-at_fn_group_banner 498 'json.at:90' \
+#AT_STOP_498
+#AT_START_499
+at_fn_group_banner 499 'json.at:90' \
   "surrogate pairs - C" "                            " 35
 at_xfail=no
 (
-  $as_echo "498. $at_setup_line: testing $at_desc ..."
+  $as_echo "499. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55586,7 +55614,7 @@
 $as_echo "$at_srcdir/json.at:90: printf %s \"[\\\"\\\\ud834\\\\udd1e\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:90"
 ( $at_check_trace; printf %s "[\"\\ud834\\udd1e\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55600,7 +55628,7 @@
 $as_echo "$at_srcdir/json.at:90: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:90"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55614,7 +55642,7 @@
 $as_echo "$at_srcdir/json.at:90: cat stdout"
 at_fn_check_prepare_trace "json.at:90"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55630,14 +55658,14 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_498
-#AT_START_499
-at_fn_group_banner 499 'json.at:93' \
+#AT_STOP_499
+#AT_START_500
+at_fn_group_banner 500 'json.at:93' \
   "surrogate pairs - Python" "                       " 35
 at_xfail=no
       $PYTHON -c "exit(len(u'\U00010800'))"; test $? -ne 1 && at_xfail=yes
 (
-  $as_echo "499. $at_setup_line: testing $at_desc ..."
+  $as_echo "500. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55649,7 +55677,7 @@
 $as_echo "$at_srcdir/json.at:93: printf %s \"[\\\"\\\\ud834\\\\udd1e\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:93"
 ( $at_check_trace; printf %s "[\"\\ud834\\udd1e\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55663,7 +55691,7 @@
 $as_echo "$at_srcdir/json.at:93: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:93"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55677,7 +55705,7 @@
 $as_echo "$at_srcdir/json.at:93: cat stdout"
 at_fn_check_prepare_trace "json.at:93"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55693,13 +55721,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_499
-#AT_START_500
-at_fn_group_banner 500 'json.at:96' \
+#AT_STOP_500
+#AT_START_501
+at_fn_group_banner 501 'json.at:96' \
   "a string by itself is not valid JSON - C" "       " 35
 at_xfail=no
 (
-  $as_echo "500. $at_setup_line: testing $at_desc ..."
+  $as_echo "501. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55707,7 +55735,7 @@
 $as_echo "$at_srcdir/json.at:96: printf %s \"\\\"xxx\\\"\" > input"
 at_fn_check_prepare_trace "json.at:96"
 ( $at_check_trace; printf %s "\"xxx\"" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55721,7 +55749,7 @@
 $as_echo "$at_srcdir/json.at:96: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:96"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55735,7 +55763,7 @@
 $as_echo "$at_srcdir/json.at:96: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:96"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55751,13 +55779,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_500
-#AT_START_501
-at_fn_group_banner 501 'json.at:96' \
+#AT_STOP_501
+#AT_START_502
+at_fn_group_banner 502 'json.at:96' \
   "a string by itself is not valid JSON - Python" "  " 35
 at_xfail=no
 (
-  $as_echo "501. $at_setup_line: testing $at_desc ..."
+  $as_echo "502. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55768,7 +55796,7 @@
 $as_echo "$at_srcdir/json.at:96: printf %s \"\\\"xxx\\\"\" > input"
 at_fn_check_prepare_trace "json.at:96"
 ( $at_check_trace; printf %s "\"xxx\"" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55782,7 +55810,7 @@
 $as_echo "$at_srcdir/json.at:96: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:96"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55796,7 +55824,7 @@
 $as_echo "$at_srcdir/json.at:96: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:96"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55812,13 +55840,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_501
-#AT_START_502
-at_fn_group_banner 502 'json.at:98' \
+#AT_STOP_502
+#AT_START_503
+at_fn_group_banner 503 'json.at:98' \
   "end of line in quoted string - C" "               " 35
 at_xfail=no
 (
-  $as_echo "502. $at_setup_line: testing $at_desc ..."
+  $as_echo "503. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55828,7 +55856,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "json.at:98"
 ( $at_check_trace; printf %s "[\"xxx
 \"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55842,7 +55870,7 @@
 $as_echo "$at_srcdir/json.at:98: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:98"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55856,7 +55884,7 @@
 $as_echo "$at_srcdir/json.at:98: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:98"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55872,13 +55900,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_502
-#AT_START_503
-at_fn_group_banner 503 'json.at:98' \
+#AT_STOP_503
+#AT_START_504
+at_fn_group_banner 504 'json.at:98' \
   "end of line in quoted string - Python" "          " 35
 at_xfail=no
 (
-  $as_echo "503. $at_setup_line: testing $at_desc ..."
+  $as_echo "504. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55891,7 +55919,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "json.at:98"
 ( $at_check_trace; printf %s "[\"xxx
 \"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55905,7 +55933,7 @@
 $as_echo "$at_srcdir/json.at:98: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:98"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55919,7 +55947,7 @@
 $as_echo "$at_srcdir/json.at:98: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:98"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55935,13 +55963,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_503
-#AT_START_504
-at_fn_group_banner 504 'json.at:102' \
+#AT_STOP_504
+#AT_START_505
+at_fn_group_banner 505 'json.at:102' \
   "formfeed in quoted string - C" "                  " 35
 at_xfail=no
 (
-  $as_echo "504. $at_setup_line: testing $at_desc ..."
+  $as_echo "505. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -55949,7 +55977,7 @@
 $as_echo "$at_srcdir/json.at:102: printf %s \"[\\\"xxx\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:102"
 ( $at_check_trace; printf %s "[\"xxx\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55963,7 +55991,7 @@
 $as_echo "$at_srcdir/json.at:102: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:102"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55977,7 +56005,7 @@
 $as_echo "$at_srcdir/json.at:102: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:102"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -55993,13 +56021,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_504
-#AT_START_505
-at_fn_group_banner 505 'json.at:102' \
+#AT_STOP_505
+#AT_START_506
+at_fn_group_banner 506 'json.at:102' \
   "formfeed in quoted string - Python" "             " 35
 at_xfail=no
 (
-  $as_echo "505. $at_setup_line: testing $at_desc ..."
+  $as_echo "506. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56010,7 +56038,7 @@
 $as_echo "$at_srcdir/json.at:102: printf %s \"[\\\"xxx\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:102"
 ( $at_check_trace; printf %s "[\"xxx\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56024,7 +56052,7 @@
 $as_echo "$at_srcdir/json.at:102: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:102"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56038,7 +56066,7 @@
 $as_echo "$at_srcdir/json.at:102: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:102"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56054,13 +56082,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_505
-#AT_START_506
-at_fn_group_banner 506 'json.at:105' \
+#AT_STOP_506
+#AT_START_507
+at_fn_group_banner 507 'json.at:105' \
   "bad escape in quoted string - C" "                " 35
 at_xfail=no
 (
-  $as_echo "506. $at_setup_line: testing $at_desc ..."
+  $as_echo "507. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56068,7 +56096,7 @@
 $as_echo "$at_srcdir/json.at:105: printf %s \"[\\\"\\\\x12\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:105"
 ( $at_check_trace; printf %s "[\"\\x12\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56082,7 +56110,7 @@
 $as_echo "$at_srcdir/json.at:105: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:105"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56096,7 +56124,7 @@
 $as_echo "$at_srcdir/json.at:105: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:105"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56112,13 +56140,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_506
-#AT_START_507
-at_fn_group_banner 507 'json.at:105' \
+#AT_STOP_507
+#AT_START_508
+at_fn_group_banner 508 'json.at:105' \
   "bad escape in quoted string - Python" "           " 35
 at_xfail=no
 (
-  $as_echo "507. $at_setup_line: testing $at_desc ..."
+  $as_echo "508. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56129,7 +56157,7 @@
 $as_echo "$at_srcdir/json.at:105: printf %s \"[\\\"\\\\x12\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:105"
 ( $at_check_trace; printf %s "[\"\\x12\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56143,7 +56171,7 @@
 $as_echo "$at_srcdir/json.at:105: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:105"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56157,7 +56185,7 @@
 $as_echo "$at_srcdir/json.at:105: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:105"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56173,13 +56201,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_507
-#AT_START_508
-at_fn_group_banner 508 'json.at:108' \
+#AT_STOP_508
+#AT_START_509
+at_fn_group_banner 509 'json.at:108' \
   "\\u must be followed by 4 hex digits (1) - C" "    " 35
 at_xfail=no
 (
-  $as_echo "508. $at_setup_line: testing $at_desc ..."
+  $as_echo "509. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56187,7 +56215,7 @@
 $as_echo "$at_srcdir/json.at:108: printf %s \"[\\\"\\\\u1x\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:108"
 ( $at_check_trace; printf %s "[\"\\u1x\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56201,7 +56229,7 @@
 $as_echo "$at_srcdir/json.at:108: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:108"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56215,7 +56243,7 @@
 $as_echo "$at_srcdir/json.at:108: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:108"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56231,13 +56259,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_508
-#AT_START_509
-at_fn_group_banner 509 'json.at:108' \
+#AT_STOP_509
+#AT_START_510
+at_fn_group_banner 510 'json.at:108' \
   "\\u must be followed by 4 hex digits (1) - Python" "" 35
 at_xfail=no
 (
-  $as_echo "509. $at_setup_line: testing $at_desc ..."
+  $as_echo "510. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56248,7 +56276,7 @@
 $as_echo "$at_srcdir/json.at:108: printf %s \"[\\\"\\\\u1x\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:108"
 ( $at_check_trace; printf %s "[\"\\u1x\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56262,7 +56290,7 @@
 $as_echo "$at_srcdir/json.at:108: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:108"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56276,7 +56304,7 @@
 $as_echo "$at_srcdir/json.at:108: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:108"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56292,13 +56320,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_509
-#AT_START_510
-at_fn_group_banner 510 'json.at:111' \
+#AT_STOP_510
+#AT_START_511
+at_fn_group_banner 511 'json.at:111' \
   "\\u must be followed by 4 hex digits (2) - C" "    " 35
 at_xfail=no
 (
-  $as_echo "510. $at_setup_line: testing $at_desc ..."
+  $as_echo "511. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56306,7 +56334,7 @@
 $as_echo "$at_srcdir/json.at:111: printf %s \"[\\\"\\\\u1xyz\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:111"
 ( $at_check_trace; printf %s "[\"\\u1xyz\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56320,7 +56348,7 @@
 $as_echo "$at_srcdir/json.at:111: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:111"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56334,7 +56362,7 @@
 $as_echo "$at_srcdir/json.at:111: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:111"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56350,13 +56378,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_510
-#AT_START_511
-at_fn_group_banner 511 'json.at:111' \
+#AT_STOP_511
+#AT_START_512
+at_fn_group_banner 512 'json.at:111' \
   "\\u must be followed by 4 hex digits (2) - Python" "" 35
 at_xfail=no
 (
-  $as_echo "511. $at_setup_line: testing $at_desc ..."
+  $as_echo "512. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56367,7 +56395,7 @@
 $as_echo "$at_srcdir/json.at:111: printf %s \"[\\\"\\\\u1xyz\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:111"
 ( $at_check_trace; printf %s "[\"\\u1xyz\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56381,7 +56409,7 @@
 $as_echo "$at_srcdir/json.at:111: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:111"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56395,7 +56423,7 @@
 $as_echo "$at_srcdir/json.at:111: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:111"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56411,13 +56439,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_511
-#AT_START_512
-at_fn_group_banner 512 'json.at:114' \
+#AT_STOP_512
+#AT_START_513
+at_fn_group_banner 513 'json.at:114' \
   "isolated leading surrogate not allowed - C" "     " 35
 at_xfail=no
 (
-  $as_echo "512. $at_setup_line: testing $at_desc ..."
+  $as_echo "513. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56425,7 +56453,7 @@
 $as_echo "$at_srcdir/json.at:114: printf %s \"[\\\"\\\\ud834xxx\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:114"
 ( $at_check_trace; printf %s "[\"\\ud834xxx\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56439,7 +56467,7 @@
 $as_echo "$at_srcdir/json.at:114: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:114"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56453,7 +56481,7 @@
 $as_echo "$at_srcdir/json.at:114: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:114"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56469,13 +56497,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_512
-#AT_START_513
-at_fn_group_banner 513 'json.at:114' \
+#AT_STOP_513
+#AT_START_514
+at_fn_group_banner 514 'json.at:114' \
   "isolated leading surrogate not allowed - Python" "" 35
 at_xfail=no
 (
-  $as_echo "513. $at_setup_line: testing $at_desc ..."
+  $as_echo "514. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56486,7 +56514,7 @@
 $as_echo "$at_srcdir/json.at:114: printf %s \"[\\\"\\\\ud834xxx\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:114"
 ( $at_check_trace; printf %s "[\"\\ud834xxx\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56500,7 +56528,7 @@
 $as_echo "$at_srcdir/json.at:114: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:114"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56514,7 +56542,7 @@
 $as_echo "$at_srcdir/json.at:114: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:114"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56530,13 +56558,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_513
-#AT_START_514
-at_fn_group_banner 514 'json.at:117' \
+#AT_STOP_514
+#AT_START_515
+at_fn_group_banner 515 'json.at:117' \
   "surrogatess must paired properly - C" "           " 35
 at_xfail=no
 (
-  $as_echo "514. $at_setup_line: testing $at_desc ..."
+  $as_echo "515. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56544,7 +56572,7 @@
 $as_echo "$at_srcdir/json.at:117: printf %s \"[\\\"\\\\ud834\\\\u1234\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:117"
 ( $at_check_trace; printf %s "[\"\\ud834\\u1234\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56558,7 +56586,7 @@
 $as_echo "$at_srcdir/json.at:117: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:117"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56572,7 +56600,7 @@
 $as_echo "$at_srcdir/json.at:117: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:117"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56588,13 +56616,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_514
-#AT_START_515
-at_fn_group_banner 515 'json.at:117' \
+#AT_STOP_515
+#AT_START_516
+at_fn_group_banner 516 'json.at:117' \
   "surrogatess must paired properly - Python" "      " 35
 at_xfail=no
 (
-  $as_echo "515. $at_setup_line: testing $at_desc ..."
+  $as_echo "516. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56605,7 +56633,7 @@
 $as_echo "$at_srcdir/json.at:117: printf %s \"[\\\"\\\\ud834\\\\u1234\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:117"
 ( $at_check_trace; printf %s "[\"\\ud834\\u1234\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56619,7 +56647,7 @@
 $as_echo "$at_srcdir/json.at:117: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:117"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56633,7 +56661,7 @@
 $as_echo "$at_srcdir/json.at:117: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:117"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56649,13 +56677,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_515
-#AT_START_516
-at_fn_group_banner 516 'json.at:120' \
+#AT_STOP_516
+#AT_START_517
+at_fn_group_banner 517 'json.at:120' \
   "null bytes not allowed - C" "                     " 35
 at_xfail=no
 (
-  $as_echo "516. $at_setup_line: testing $at_desc ..."
+  $as_echo "517. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56663,7 +56691,7 @@
 $as_echo "$at_srcdir/json.at:120: printf %s \"[\\\"\\\\u0000\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:120"
 ( $at_check_trace; printf %s "[\"\\u0000\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56677,7 +56705,7 @@
 $as_echo "$at_srcdir/json.at:120: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:120"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56691,7 +56719,7 @@
 $as_echo "$at_srcdir/json.at:120: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:120"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56707,13 +56735,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_516
-#AT_START_517
-at_fn_group_banner 517 'json.at:120' \
+#AT_STOP_517
+#AT_START_518
+at_fn_group_banner 518 'json.at:120' \
   "null bytes not allowed - Python" "                " 35
 at_xfail=no
 (
-  $as_echo "517. $at_setup_line: testing $at_desc ..."
+  $as_echo "518. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56724,7 +56752,7 @@
 $as_echo "$at_srcdir/json.at:120: printf %s \"[\\\"\\\\u0000\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:120"
 ( $at_check_trace; printf %s "[\"\\u0000\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56738,7 +56766,7 @@
 $as_echo "$at_srcdir/json.at:120: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:120"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56752,7 +56780,7 @@
 $as_echo "$at_srcdir/json.at:120: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:120"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56768,13 +56796,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_517
-#AT_START_518
-at_fn_group_banner 518 'json.at:124' \
+#AT_STOP_518
+#AT_START_519
+at_fn_group_banner 519 'json.at:124' \
   "properly quoted backslash at end of string - C" " " 35
 at_xfail=no
 (
-  $as_echo "518. $at_setup_line: testing $at_desc ..."
+  $as_echo "519. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56782,7 +56810,7 @@
 $as_echo "$at_srcdir/json.at:124: printf %s \"[\\\"\\\\\\\\\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:124"
 ( $at_check_trace; printf %s "[\"\\\\\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56796,7 +56824,7 @@
 $as_echo "$at_srcdir/json.at:124: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:124"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56810,7 +56838,7 @@
 $as_echo "$at_srcdir/json.at:124: cat stdout"
 at_fn_check_prepare_trace "json.at:124"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56826,13 +56854,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_518
-#AT_START_519
-at_fn_group_banner 519 'json.at:124' \
+#AT_STOP_519
+#AT_START_520
+at_fn_group_banner 520 'json.at:124' \
   "properly quoted backslash at end of string - Python" "" 35
 at_xfail=no
 (
-  $as_echo "519. $at_setup_line: testing $at_desc ..."
+  $as_echo "520. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56843,7 +56871,7 @@
 $as_echo "$at_srcdir/json.at:124: printf %s \"[\\\"\\\\\\\\\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:124"
 ( $at_check_trace; printf %s "[\"\\\\\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56857,7 +56885,7 @@
 $as_echo "$at_srcdir/json.at:124: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:124"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56871,7 +56899,7 @@
 $as_echo "$at_srcdir/json.at:124: cat stdout"
 at_fn_check_prepare_trace "json.at:124"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56887,13 +56915,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_519
-#AT_START_520
-at_fn_group_banner 520 'json.at:127' \
+#AT_STOP_520
+#AT_START_521
+at_fn_group_banner 521 'json.at:127' \
   "stray backslash at end of string - C" "           " 35
 at_xfail=no
 (
-  $as_echo "520. $at_setup_line: testing $at_desc ..."
+  $as_echo "521. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56901,7 +56929,7 @@
 $as_echo "$at_srcdir/json.at:127: printf %s \"[\\\"abcd\\\\\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:127"
 ( $at_check_trace; printf %s "[\"abcd\\\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56915,7 +56943,7 @@
 $as_echo "$at_srcdir/json.at:127: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:127"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56929,7 +56957,7 @@
 $as_echo "$at_srcdir/json.at:127: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:127"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56945,13 +56973,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_520
-#AT_START_521
-at_fn_group_banner 521 'json.at:127' \
+#AT_STOP_521
+#AT_START_522
+at_fn_group_banner 522 'json.at:127' \
   "stray backslash at end of string - Python" "      " 35
 at_xfail=no
 (
-  $as_echo "521. $at_setup_line: testing $at_desc ..."
+  $as_echo "522. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -56962,7 +56990,7 @@
 $as_echo "$at_srcdir/json.at:127: printf %s \"[\\\"abcd\\\\\\\"]\" > input"
 at_fn_check_prepare_trace "json.at:127"
 ( $at_check_trace; printf %s "[\"abcd\\\"]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56976,7 +57004,7 @@
 $as_echo "$at_srcdir/json.at:127: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:127"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -56990,7 +57018,7 @@
 $as_echo "$at_srcdir/json.at:127: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:127"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57006,13 +57034,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_521
-#AT_START_522
-at_fn_group_banner 522 'json.at:131' \
+#AT_STOP_522
+#AT_START_523
+at_fn_group_banner 523 'json.at:131' \
   "end of input in quoted string - C" "              " 35
 at_xfail=no
 (
-  $as_echo "522. $at_setup_line: testing $at_desc ..."
+  $as_echo "523. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57020,7 +57048,7 @@
 $as_echo "$at_srcdir/json.at:133: printf '\"xxx' | ovstest test-json -"
 at_fn_check_prepare_notrace 'a shell pipeline' "json.at:133"
 ( $at_check_trace; printf '"xxx' | ovstest test-json -
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57035,13 +57063,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_522
-#AT_START_523
-at_fn_group_banner 523 'json.at:138' \
+#AT_STOP_523
+#AT_START_524
+at_fn_group_banner 524 'json.at:138' \
   "end of input in quoted string - Python" "         " 35
 at_xfail=no
 (
-  $as_echo "523. $at_setup_line: testing $at_desc ..."
+  $as_echo "524. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57054,7 +57082,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "json.at:141"
 ( $at_check_trace; printf '"xxx' > input
 $PYTHON $srcdir/test-json.py input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57069,13 +57097,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_523
-#AT_START_524
-at_fn_group_banner 524 'json.at:149' \
+#AT_STOP_524
+#AT_START_525
+at_fn_group_banner 525 'json.at:149' \
   "empty object - C" "                               " 36
 at_xfail=no
 (
-  $as_echo "524. $at_setup_line: testing $at_desc ..."
+  $as_echo "525. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57083,7 +57111,7 @@
 $as_echo "$at_srcdir/json.at:149: printf %s \"{ }\" > input"
 at_fn_check_prepare_trace "json.at:149"
 ( $at_check_trace; printf %s "{ }" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57097,7 +57125,7 @@
 $as_echo "$at_srcdir/json.at:149: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:149"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57111,7 +57139,7 @@
 $as_echo "$at_srcdir/json.at:149: cat stdout"
 at_fn_check_prepare_trace "json.at:149"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57127,13 +57155,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_524
-#AT_START_525
-at_fn_group_banner 525 'json.at:149' \
+#AT_STOP_525
+#AT_START_526
+at_fn_group_banner 526 'json.at:149' \
   "empty object - Python" "                          " 36
 at_xfail=no
 (
-  $as_echo "525. $at_setup_line: testing $at_desc ..."
+  $as_echo "526. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57144,7 +57172,7 @@
 $as_echo "$at_srcdir/json.at:149: printf %s \"{ }\" > input"
 at_fn_check_prepare_trace "json.at:149"
 ( $at_check_trace; printf %s "{ }" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57158,7 +57186,7 @@
 $as_echo "$at_srcdir/json.at:149: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:149"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57172,7 +57200,7 @@
 $as_echo "$at_srcdir/json.at:149: cat stdout"
 at_fn_check_prepare_trace "json.at:149"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57188,13 +57216,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_525
-#AT_START_526
-at_fn_group_banner 526 'json.at:150' \
+#AT_STOP_526
+#AT_START_527
+at_fn_group_banner 527 'json.at:150' \
   "simple object - C" "                              " 36
 at_xfail=no
 (
-  $as_echo "526. $at_setup_line: testing $at_desc ..."
+  $as_echo "527. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57202,7 +57230,7 @@
 $as_echo "$at_srcdir/json.at:150: printf %s \"{\\\"b\\\": 2, \\\"a\\\": 1, \\\"c\\\": 3}\" > input"
 at_fn_check_prepare_trace "json.at:150"
 ( $at_check_trace; printf %s "{\"b\": 2, \"a\": 1, \"c\": 3}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57216,7 +57244,7 @@
 $as_echo "$at_srcdir/json.at:150: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:150"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57230,7 +57258,7 @@
 $as_echo "$at_srcdir/json.at:150: cat stdout"
 at_fn_check_prepare_trace "json.at:150"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57246,13 +57274,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_526
-#AT_START_527
-at_fn_group_banner 527 'json.at:150' \
+#AT_STOP_527
+#AT_START_528
+at_fn_group_banner 528 'json.at:150' \
   "simple object - Python" "                         " 36
 at_xfail=no
 (
-  $as_echo "527. $at_setup_line: testing $at_desc ..."
+  $as_echo "528. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57263,7 +57291,7 @@
 $as_echo "$at_srcdir/json.at:150: printf %s \"{\\\"b\\\": 2, \\\"a\\\": 1, \\\"c\\\": 3}\" > input"
 at_fn_check_prepare_trace "json.at:150"
 ( $at_check_trace; printf %s "{\"b\": 2, \"a\": 1, \"c\": 3}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57277,7 +57305,7 @@
 $as_echo "$at_srcdir/json.at:150: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:150"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57291,7 +57319,7 @@
 $as_echo "$at_srcdir/json.at:150: cat stdout"
 at_fn_check_prepare_trace "json.at:150"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57307,13 +57335,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_527
-#AT_START_528
-at_fn_group_banner 528 'json.at:153' \
+#AT_STOP_528
+#AT_START_529
+at_fn_group_banner 529 'json.at:153' \
   "bad value - C" "                                  " 36
 at_xfail=no
 (
-  $as_echo "528. $at_setup_line: testing $at_desc ..."
+  $as_echo "529. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57321,7 +57349,7 @@
 $as_echo "$at_srcdir/json.at:153: printf %s \"{\\\"a\\\": }, \\\"b\\\": 2\" > input"
 at_fn_check_prepare_trace "json.at:153"
 ( $at_check_trace; printf %s "{\"a\": }, \"b\": 2" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57335,7 +57363,7 @@
 $as_echo "$at_srcdir/json.at:153: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:153"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57349,7 +57377,7 @@
 $as_echo "$at_srcdir/json.at:153: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:153"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57365,13 +57393,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_528
-#AT_START_529
-at_fn_group_banner 529 'json.at:153' \
+#AT_STOP_529
+#AT_START_530
+at_fn_group_banner 530 'json.at:153' \
   "bad value - Python" "                             " 36
 at_xfail=no
 (
-  $as_echo "529. $at_setup_line: testing $at_desc ..."
+  $as_echo "530. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57382,7 +57410,7 @@
 $as_echo "$at_srcdir/json.at:153: printf %s \"{\\\"a\\\": }, \\\"b\\\": 2\" > input"
 at_fn_check_prepare_trace "json.at:153"
 ( $at_check_trace; printf %s "{\"a\": }, \"b\": 2" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57396,7 +57424,7 @@
 $as_echo "$at_srcdir/json.at:153: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:153"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57410,7 +57438,7 @@
 $as_echo "$at_srcdir/json.at:153: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:153"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57426,13 +57454,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_529
-#AT_START_530
-at_fn_group_banner 530 'json.at:155' \
+#AT_STOP_530
+#AT_START_531
+at_fn_group_banner 531 'json.at:155' \
   "missing colon - C" "                              " 36
 at_xfail=no
 (
-  $as_echo "530. $at_setup_line: testing $at_desc ..."
+  $as_echo "531. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57440,7 +57468,7 @@
 $as_echo "$at_srcdir/json.at:155: printf %s \"{\\\"b\\\": 2, \\\"a\\\" 1, \\\"c\\\": 3}\" > input"
 at_fn_check_prepare_trace "json.at:155"
 ( $at_check_trace; printf %s "{\"b\": 2, \"a\" 1, \"c\": 3}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57454,7 +57482,7 @@
 $as_echo "$at_srcdir/json.at:155: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:155"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57468,7 +57496,7 @@
 $as_echo "$at_srcdir/json.at:155: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:155"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57484,13 +57512,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_530
-#AT_START_531
-at_fn_group_banner 531 'json.at:155' \
+#AT_STOP_531
+#AT_START_532
+at_fn_group_banner 532 'json.at:155' \
   "missing colon - Python" "                         " 36
 at_xfail=no
 (
-  $as_echo "531. $at_setup_line: testing $at_desc ..."
+  $as_echo "532. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57501,7 +57529,7 @@
 $as_echo "$at_srcdir/json.at:155: printf %s \"{\\\"b\\\": 2, \\\"a\\\" 1, \\\"c\\\": 3}\" > input"
 at_fn_check_prepare_trace "json.at:155"
 ( $at_check_trace; printf %s "{\"b\": 2, \"a\" 1, \"c\": 3}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57515,7 +57543,7 @@
 $as_echo "$at_srcdir/json.at:155: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:155"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57529,7 +57557,7 @@
 $as_echo "$at_srcdir/json.at:155: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:155"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57545,13 +57573,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_531
-#AT_START_532
-at_fn_group_banner 532 'json.at:157' \
+#AT_STOP_532
+#AT_START_533
+at_fn_group_banner 533 'json.at:157' \
   "missing comma - C" "                              " 36
 at_xfail=no
 (
-  $as_echo "532. $at_setup_line: testing $at_desc ..."
+  $as_echo "533. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57559,7 +57587,7 @@
 $as_echo "$at_srcdir/json.at:157: printf %s \"{\\\"b\\\": 2 \\\"a\\\" 1, \\\"c\\\": 3}\" > input"
 at_fn_check_prepare_trace "json.at:157"
 ( $at_check_trace; printf %s "{\"b\": 2 \"a\" 1, \"c\": 3}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57573,7 +57601,7 @@
 $as_echo "$at_srcdir/json.at:157: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:157"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57587,7 +57615,7 @@
 $as_echo "$at_srcdir/json.at:157: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:157"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57603,13 +57631,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_532
-#AT_START_533
-at_fn_group_banner 533 'json.at:157' \
+#AT_STOP_533
+#AT_START_534
+at_fn_group_banner 534 'json.at:157' \
   "missing comma - Python" "                         " 36
 at_xfail=no
 (
-  $as_echo "533. $at_setup_line: testing $at_desc ..."
+  $as_echo "534. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57620,7 +57648,7 @@
 $as_echo "$at_srcdir/json.at:157: printf %s \"{\\\"b\\\": 2 \\\"a\\\" 1, \\\"c\\\": 3}\" > input"
 at_fn_check_prepare_trace "json.at:157"
 ( $at_check_trace; printf %s "{\"b\": 2 \"a\" 1, \"c\": 3}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57634,7 +57662,7 @@
 $as_echo "$at_srcdir/json.at:157: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:157"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57648,7 +57676,7 @@
 $as_echo "$at_srcdir/json.at:157: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:157"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57664,13 +57692,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_533
-#AT_START_534
-at_fn_group_banner 534 'json.at:159' \
+#AT_STOP_534
+#AT_START_535
+at_fn_group_banner 535 'json.at:159' \
   "trailing comma not allowed - C" "                 " 36
 at_xfail=no
 (
-  $as_echo "534. $at_setup_line: testing $at_desc ..."
+  $as_echo "535. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57678,7 +57706,7 @@
 $as_echo "$at_srcdir/json.at:159: printf %s \"{\\\"b\\\": 2, \\\"a\\\": 1, \\\"c\\\": 3, }\" > input"
 at_fn_check_prepare_trace "json.at:159"
 ( $at_check_trace; printf %s "{\"b\": 2, \"a\": 1, \"c\": 3, }" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57692,7 +57720,7 @@
 $as_echo "$at_srcdir/json.at:159: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:159"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57706,7 +57734,7 @@
 $as_echo "$at_srcdir/json.at:159: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:159"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57722,13 +57750,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_534
-#AT_START_535
-at_fn_group_banner 535 'json.at:159' \
+#AT_STOP_535
+#AT_START_536
+at_fn_group_banner 536 'json.at:159' \
   "trailing comma not allowed - Python" "            " 36
 at_xfail=no
 (
-  $as_echo "535. $at_setup_line: testing $at_desc ..."
+  $as_echo "536. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57739,7 +57767,7 @@
 $as_echo "$at_srcdir/json.at:159: printf %s \"{\\\"b\\\": 2, \\\"a\\\": 1, \\\"c\\\": 3, }\" > input"
 at_fn_check_prepare_trace "json.at:159"
 ( $at_check_trace; printf %s "{\"b\": 2, \"a\": 1, \"c\": 3, }" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57753,7 +57781,7 @@
 $as_echo "$at_srcdir/json.at:159: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:159"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57767,7 +57795,7 @@
 $as_echo "$at_srcdir/json.at:159: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:159"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57783,13 +57811,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_535
-#AT_START_536
-at_fn_group_banner 536 'json.at:162' \
+#AT_STOP_536
+#AT_START_537
+at_fn_group_banner 537 'json.at:162' \
   "doubled comma not allowed - C" "                  " 36
 at_xfail=no
 (
-  $as_echo "536. $at_setup_line: testing $at_desc ..."
+  $as_echo "537. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57797,7 +57825,7 @@
 $as_echo "$at_srcdir/json.at:162: printf %s \"{\\\"b\\\": 2, \\\"a\\\": 1,, \\\"c\\\": 3}\" > input"
 at_fn_check_prepare_trace "json.at:162"
 ( $at_check_trace; printf %s "{\"b\": 2, \"a\": 1,, \"c\": 3}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57811,7 +57839,7 @@
 $as_echo "$at_srcdir/json.at:162: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:162"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57825,7 +57853,7 @@
 $as_echo "$at_srcdir/json.at:162: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:162"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57841,13 +57869,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_536
-#AT_START_537
-at_fn_group_banner 537 'json.at:162' \
+#AT_STOP_537
+#AT_START_538
+at_fn_group_banner 538 'json.at:162' \
   "doubled comma not allowed - Python" "             " 36
 at_xfail=no
 (
-  $as_echo "537. $at_setup_line: testing $at_desc ..."
+  $as_echo "538. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57858,7 +57886,7 @@
 $as_echo "$at_srcdir/json.at:162: printf %s \"{\\\"b\\\": 2, \\\"a\\\": 1,, \\\"c\\\": 3}\" > input"
 at_fn_check_prepare_trace "json.at:162"
 ( $at_check_trace; printf %s "{\"b\": 2, \"a\": 1,, \"c\": 3}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57872,7 +57900,7 @@
 $as_echo "$at_srcdir/json.at:162: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:162"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57886,7 +57914,7 @@
 $as_echo "$at_srcdir/json.at:162: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:162"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57902,13 +57930,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_537
-#AT_START_538
-at_fn_group_banner 538 'json.at:165' \
+#AT_STOP_538
+#AT_START_539
+at_fn_group_banner 539 'json.at:165' \
   "names must be strings - C" "                      " 36
 at_xfail=no
 (
-  $as_echo "538. $at_setup_line: testing $at_desc ..."
+  $as_echo "539. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57916,7 +57944,7 @@
 $as_echo "$at_srcdir/json.at:165: printf %s \"{1: 2}\" > input"
 at_fn_check_prepare_trace "json.at:165"
 ( $at_check_trace; printf %s "{1: 2}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57930,7 +57958,7 @@
 $as_echo "$at_srcdir/json.at:165: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:165"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57944,7 +57972,7 @@
 $as_echo "$at_srcdir/json.at:165: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:165"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57960,13 +57988,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_538
-#AT_START_539
-at_fn_group_banner 539 'json.at:165' \
+#AT_STOP_539
+#AT_START_540
+at_fn_group_banner 540 'json.at:165' \
   "names must be strings - Python" "                 " 36
 at_xfail=no
 (
-  $as_echo "539. $at_setup_line: testing $at_desc ..."
+  $as_echo "540. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -57977,7 +58005,7 @@
 $as_echo "$at_srcdir/json.at:165: printf %s \"{1: 2}\" > input"
 at_fn_check_prepare_trace "json.at:165"
 ( $at_check_trace; printf %s "{1: 2}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -57991,7 +58019,7 @@
 $as_echo "$at_srcdir/json.at:165: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:165"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58005,7 +58033,7 @@
 $as_echo "$at_srcdir/json.at:165: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:165"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58021,13 +58049,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_539
-#AT_START_540
-at_fn_group_banner 540 'json.at:171' \
+#AT_STOP_540
+#AT_START_541
+at_fn_group_banner 541 'json.at:171' \
   "null - C" "                                       " 37
 at_xfail=no
 (
-  $as_echo "540. $at_setup_line: testing $at_desc ..."
+  $as_echo "541. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58035,7 +58063,7 @@
 $as_echo "$at_srcdir/json.at:171: printf %s \"[ null ]\" > input"
 at_fn_check_prepare_trace "json.at:171"
 ( $at_check_trace; printf %s "[ null ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58049,7 +58077,7 @@
 $as_echo "$at_srcdir/json.at:171: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:171"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58063,7 +58091,7 @@
 $as_echo "$at_srcdir/json.at:171: cat stdout"
 at_fn_check_prepare_trace "json.at:171"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58079,13 +58107,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_540
-#AT_START_541
-at_fn_group_banner 541 'json.at:171' \
+#AT_STOP_541
+#AT_START_542
+at_fn_group_banner 542 'json.at:171' \
   "null - Python" "                                  " 37
 at_xfail=no
 (
-  $as_echo "541. $at_setup_line: testing $at_desc ..."
+  $as_echo "542. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58096,7 +58124,7 @@
 $as_echo "$at_srcdir/json.at:171: printf %s \"[ null ]\" > input"
 at_fn_check_prepare_trace "json.at:171"
 ( $at_check_trace; printf %s "[ null ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58110,7 +58138,7 @@
 $as_echo "$at_srcdir/json.at:171: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:171"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58124,7 +58152,7 @@
 $as_echo "$at_srcdir/json.at:171: cat stdout"
 at_fn_check_prepare_trace "json.at:171"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58140,13 +58168,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_541
-#AT_START_542
-at_fn_group_banner 542 'json.at:172' \
+#AT_STOP_542
+#AT_START_543
+at_fn_group_banner 543 'json.at:172' \
   "false - C" "                                      " 37
 at_xfail=no
 (
-  $as_echo "542. $at_setup_line: testing $at_desc ..."
+  $as_echo "543. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58154,7 +58182,7 @@
 $as_echo "$at_srcdir/json.at:172: printf %s \"[ false ]\" > input"
 at_fn_check_prepare_trace "json.at:172"
 ( $at_check_trace; printf %s "[ false ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58168,7 +58196,7 @@
 $as_echo "$at_srcdir/json.at:172: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:172"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58182,7 +58210,7 @@
 $as_echo "$at_srcdir/json.at:172: cat stdout"
 at_fn_check_prepare_trace "json.at:172"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58198,13 +58226,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_542
-#AT_START_543
-at_fn_group_banner 543 'json.at:172' \
+#AT_STOP_543
+#AT_START_544
+at_fn_group_banner 544 'json.at:172' \
   "false - Python" "                                 " 37
 at_xfail=no
 (
-  $as_echo "543. $at_setup_line: testing $at_desc ..."
+  $as_echo "544. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58215,7 +58243,7 @@
 $as_echo "$at_srcdir/json.at:172: printf %s \"[ false ]\" > input"
 at_fn_check_prepare_trace "json.at:172"
 ( $at_check_trace; printf %s "[ false ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58229,7 +58257,7 @@
 $as_echo "$at_srcdir/json.at:172: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:172"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58243,7 +58271,7 @@
 $as_echo "$at_srcdir/json.at:172: cat stdout"
 at_fn_check_prepare_trace "json.at:172"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58259,13 +58287,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_543
-#AT_START_544
-at_fn_group_banner 544 'json.at:173' \
+#AT_STOP_544
+#AT_START_545
+at_fn_group_banner 545 'json.at:173' \
   "true - C" "                                       " 37
 at_xfail=no
 (
-  $as_echo "544. $at_setup_line: testing $at_desc ..."
+  $as_echo "545. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58273,7 +58301,7 @@
 $as_echo "$at_srcdir/json.at:173: printf %s \"[ true ]\" > input"
 at_fn_check_prepare_trace "json.at:173"
 ( $at_check_trace; printf %s "[ true ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58287,7 +58315,7 @@
 $as_echo "$at_srcdir/json.at:173: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:173"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58301,7 +58329,7 @@
 $as_echo "$at_srcdir/json.at:173: cat stdout"
 at_fn_check_prepare_trace "json.at:173"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58317,13 +58345,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_544
-#AT_START_545
-at_fn_group_banner 545 'json.at:173' \
+#AT_STOP_545
+#AT_START_546
+at_fn_group_banner 546 'json.at:173' \
   "true - Python" "                                  " 37
 at_xfail=no
 (
-  $as_echo "545. $at_setup_line: testing $at_desc ..."
+  $as_echo "546. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58334,7 +58362,7 @@
 $as_echo "$at_srcdir/json.at:173: printf %s \"[ true ]\" > input"
 at_fn_check_prepare_trace "json.at:173"
 ( $at_check_trace; printf %s "[ true ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58348,7 +58376,7 @@
 $as_echo "$at_srcdir/json.at:173: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:173"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58362,7 +58390,7 @@
 $as_echo "$at_srcdir/json.at:173: cat stdout"
 at_fn_check_prepare_trace "json.at:173"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58378,13 +58406,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_545
-#AT_START_546
-at_fn_group_banner 546 'json.at:174' \
-  "a literal by itself is not valid JSON - C" "      " 37
+#AT_STOP_546
+#AT_START_547
+at_fn_group_banner 547 'json.at:174' \
+  "a literal by itself is not valid JSON - C" "      " 37
 at_xfail=no
 (
-  $as_echo "546. $at_setup_line: testing $at_desc ..."
+  $as_echo "547. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58392,7 +58420,7 @@
 $as_echo "$at_srcdir/json.at:174: printf %s \"null\" > input"
 at_fn_check_prepare_trace "json.at:174"
 ( $at_check_trace; printf %s "null" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58406,7 +58434,7 @@
 $as_echo "$at_srcdir/json.at:174: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:174"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58420,7 +58448,7 @@
 $as_echo "$at_srcdir/json.at:174: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:174"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58436,13 +58464,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_546
-#AT_START_547
-at_fn_group_banner 547 'json.at:174' \
+#AT_STOP_547
+#AT_START_548
+at_fn_group_banner 548 'json.at:174' \
   "a literal by itself is not valid JSON - Python" " " 37
 at_xfail=no
 (
-  $as_echo "547. $at_setup_line: testing $at_desc ..."
+  $as_echo "548. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58453,7 +58481,7 @@
 $as_echo "$at_srcdir/json.at:174: printf %s \"null\" > input"
 at_fn_check_prepare_trace "json.at:174"
 ( $at_check_trace; printf %s "null" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58467,7 +58495,7 @@
 $as_echo "$at_srcdir/json.at:174: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:174"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58481,7 +58509,7 @@
 $as_echo "$at_srcdir/json.at:174: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:174"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58497,13 +58525,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_547
-#AT_START_548
-at_fn_group_banner 548 'json.at:176' \
+#AT_STOP_548
+#AT_START_549
+at_fn_group_banner 549 'json.at:176' \
   "nullify is invalid - C" "                         " 37
 at_xfail=no
 (
-  $as_echo "548. $at_setup_line: testing $at_desc ..."
+  $as_echo "549. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58511,7 +58539,7 @@
 $as_echo "$at_srcdir/json.at:176: printf %s \"[ nullify ]\" > input"
 at_fn_check_prepare_trace "json.at:176"
 ( $at_check_trace; printf %s "[ nullify ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58525,7 +58553,7 @@
 $as_echo "$at_srcdir/json.at:176: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:176"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58539,7 +58567,7 @@
 $as_echo "$at_srcdir/json.at:176: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:176"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58555,13 +58583,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_548
-#AT_START_549
-at_fn_group_banner 549 'json.at:176' \
+#AT_STOP_549
+#AT_START_550
+at_fn_group_banner 550 'json.at:176' \
   "nullify is invalid - Python" "                    " 37
 at_xfail=no
 (
-  $as_echo "549. $at_setup_line: testing $at_desc ..."
+  $as_echo "550. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58572,7 +58600,7 @@
 $as_echo "$at_srcdir/json.at:176: printf %s \"[ nullify ]\" > input"
 at_fn_check_prepare_trace "json.at:176"
 ( $at_check_trace; printf %s "[ nullify ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58586,7 +58614,7 @@
 $as_echo "$at_srcdir/json.at:176: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:176"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58600,7 +58628,7 @@
 $as_echo "$at_srcdir/json.at:176: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:176"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58616,13 +58644,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_549
-#AT_START_550
-at_fn_group_banner 550 'json.at:178' \
+#AT_STOP_550
+#AT_START_551
+at_fn_group_banner 551 'json.at:178' \
   "nubs is invalid - C" "                            " 37
 at_xfail=no
 (
-  $as_echo "550. $at_setup_line: testing $at_desc ..."
+  $as_echo "551. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58630,7 +58658,7 @@
 $as_echo "$at_srcdir/json.at:178: printf %s \"[ nubs ]\" > input"
 at_fn_check_prepare_trace "json.at:178"
 ( $at_check_trace; printf %s "[ nubs ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58644,7 +58672,7 @@
 $as_echo "$at_srcdir/json.at:178: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:178"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58658,7 +58686,7 @@
 $as_echo "$at_srcdir/json.at:178: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:178"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58674,13 +58702,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_550
-#AT_START_551
-at_fn_group_banner 551 'json.at:178' \
+#AT_STOP_551
+#AT_START_552
+at_fn_group_banner 552 'json.at:178' \
   "nubs is invalid - Python" "                       " 37
 at_xfail=no
 (
-  $as_echo "551. $at_setup_line: testing $at_desc ..."
+  $as_echo "552. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58691,7 +58719,7 @@
 $as_echo "$at_srcdir/json.at:178: printf %s \"[ nubs ]\" > input"
 at_fn_check_prepare_trace "json.at:178"
 ( $at_check_trace; printf %s "[ nubs ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58705,7 +58733,7 @@
 $as_echo "$at_srcdir/json.at:178: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:178"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58719,7 +58747,7 @@
 $as_echo "$at_srcdir/json.at:178: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:178"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58735,13 +58763,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_551
-#AT_START_552
-at_fn_group_banner 552 'json.at:180' \
+#AT_STOP_552
+#AT_START_553
+at_fn_group_banner 553 'json.at:180' \
   "xxx is invalid - C" "                             " 37
 at_xfail=no
 (
-  $as_echo "552. $at_setup_line: testing $at_desc ..."
+  $as_echo "553. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58749,7 +58777,7 @@
 $as_echo "$at_srcdir/json.at:180: printf %s \"[ xxx ]\" > input"
 at_fn_check_prepare_trace "json.at:180"
 ( $at_check_trace; printf %s "[ xxx ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58763,7 +58791,7 @@
 $as_echo "$at_srcdir/json.at:180: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:180"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58777,7 +58805,7 @@
 $as_echo "$at_srcdir/json.at:180: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:180"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58793,13 +58821,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_552
-#AT_START_553
-at_fn_group_banner 553 'json.at:180' \
+#AT_STOP_553
+#AT_START_554
+at_fn_group_banner 554 'json.at:180' \
   "xxx is invalid - Python" "                        " 37
 at_xfail=no
 (
-  $as_echo "553. $at_setup_line: testing $at_desc ..."
+  $as_echo "554. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58810,7 +58838,7 @@
 $as_echo "$at_srcdir/json.at:180: printf %s \"[ xxx ]\" > input"
 at_fn_check_prepare_trace "json.at:180"
 ( $at_check_trace; printf %s "[ xxx ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58824,7 +58852,7 @@
 $as_echo "$at_srcdir/json.at:180: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:180"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58838,7 +58866,7 @@
 $as_echo "$at_srcdir/json.at:180: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:180"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58854,13 +58882,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_553
-#AT_START_554
-at_fn_group_banner 554 'json.at:185' \
+#AT_STOP_554
+#AT_START_555
+at_fn_group_banner 555 'json.at:185' \
   "integers expressed as reals - C" "                " 38
 at_xfail=no
 (
-  $as_echo "554. $at_setup_line: testing $at_desc ..."
+  $as_echo "555. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58880,7 +58908,7 @@
      2.1230e3,
      0e-10000,
      0e10000]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58894,7 +58922,7 @@
 $as_echo "$at_srcdir/json.at:185: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:185"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58908,7 +58936,7 @@
 $as_echo "$at_srcdir/json.at:185: cat stdout"
 at_fn_check_prepare_trace "json.at:185"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58924,13 +58952,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_554
-#AT_START_555
-at_fn_group_banner 555 'json.at:185' \
+#AT_STOP_555
+#AT_START_556
+at_fn_group_banner 556 'json.at:185' \
   "integers expressed as reals - Python" "           " 38
 at_xfail=no
 (
-  $as_echo "555. $at_setup_line: testing $at_desc ..."
+  $as_echo "556. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -58953,7 +58981,7 @@
      2.1230e3,
      0e-10000,
      0e10000]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58967,7 +58995,7 @@
 $as_echo "$at_srcdir/json.at:185: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:185"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58981,7 +59009,7 @@
 $as_echo "$at_srcdir/json.at:185: cat stdout"
 at_fn_check_prepare_trace "json.at:185"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -58997,13 +59025,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_555
-#AT_START_556
-at_fn_group_banner 556 'json.at:195' \
+#AT_STOP_556
+#AT_START_557
+at_fn_group_banner 557 'json.at:195' \
   "large integers - C" "                             " 38
 at_xfail=no
 (
-  $as_echo "556. $at_setup_line: testing $at_desc ..."
+  $as_echo "557. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59011,7 +59039,7 @@
 $as_echo "$at_srcdir/json.at:195: printf %s \"[9223372036854775807, -9223372036854775808]\" > input"
 at_fn_check_prepare_trace "json.at:195"
 ( $at_check_trace; printf %s "[9223372036854775807, -9223372036854775808]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59025,7 +59053,7 @@
 $as_echo "$at_srcdir/json.at:195: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:195"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59039,7 +59067,7 @@
 $as_echo "$at_srcdir/json.at:195: cat stdout"
 at_fn_check_prepare_trace "json.at:195"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59055,13 +59083,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_556
-#AT_START_557
-at_fn_group_banner 557 'json.at:195' \
+#AT_STOP_557
+#AT_START_558
+at_fn_group_banner 558 'json.at:195' \
   "large integers - Python" "                        " 38
 at_xfail=no
 (
-  $as_echo "557. $at_setup_line: testing $at_desc ..."
+  $as_echo "558. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59072,7 +59100,7 @@
 $as_echo "$at_srcdir/json.at:195: printf %s \"[9223372036854775807, -9223372036854775808]\" > input"
 at_fn_check_prepare_trace "json.at:195"
 ( $at_check_trace; printf %s "[9223372036854775807, -9223372036854775808]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59086,7 +59114,7 @@
 $as_echo "$at_srcdir/json.at:195: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:195"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59100,7 +59128,7 @@
 $as_echo "$at_srcdir/json.at:195: cat stdout"
 at_fn_check_prepare_trace "json.at:195"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59116,13 +59144,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_557
-#AT_START_558
-at_fn_group_banner 558 'json.at:199' \
+#AT_STOP_558
+#AT_START_559
+at_fn_group_banner 559 'json.at:199' \
   "large integers expressed as reals - C" "          " 38
 at_xfail=no
 (
-  $as_echo "558. $at_setup_line: testing $at_desc ..."
+  $as_echo "559. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59132,7 +59160,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "json.at:199"
 ( $at_check_trace; printf %s "[9223372036854775807.0, -9223372036854775808.0,
      92233720.36854775807e11, -9.223372036854775808e18]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59146,7 +59174,7 @@
 $as_echo "$at_srcdir/json.at:199: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:199"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59160,7 +59188,7 @@
 $as_echo "$at_srcdir/json.at:199: cat stdout"
 at_fn_check_prepare_trace "json.at:199"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59176,13 +59204,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_558
-#AT_START_559
-at_fn_group_banner 559 'json.at:199' \
+#AT_STOP_559
+#AT_START_560
+at_fn_group_banner 560 'json.at:199' \
   "large integers expressed as reals - Python" "     " 38
 at_xfail=no
 (
-  $as_echo "559. $at_setup_line: testing $at_desc ..."
+  $as_echo "560. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59195,7 +59223,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "json.at:199"
 ( $at_check_trace; printf %s "[9223372036854775807.0, -9223372036854775808.0,
      92233720.36854775807e11, -9.223372036854775808e18]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59209,7 +59237,7 @@
 $as_echo "$at_srcdir/json.at:199: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:199"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59223,7 +59251,7 @@
 $as_echo "$at_srcdir/json.at:199: cat stdout"
 at_fn_check_prepare_trace "json.at:199"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59239,13 +59267,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_559
-#AT_START_560
-at_fn_group_banner 560 'json.at:207' \
+#AT_STOP_560
+#AT_START_561
+at_fn_group_banner 561 'json.at:207' \
   "large integers that overflow to reals - C" "      " 38
 at_xfail=no
 (
-  $as_echo "560. $at_setup_line: testing $at_desc ..."
+  $as_echo "561. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59253,7 +59281,7 @@
 $as_echo "$at_srcdir/json.at:207: printf %s \"[9223372036854775807000, -92233720368547758080000]\" > input"
 at_fn_check_prepare_trace "json.at:207"
 ( $at_check_trace; printf %s "[9223372036854775807000, -92233720368547758080000]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59267,7 +59295,7 @@
 $as_echo "$at_srcdir/json.at:207: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:207"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59281,7 +59309,7 @@
 $as_echo "$at_srcdir/json.at:207: cat stdout"
 at_fn_check_prepare_trace "json.at:207"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59297,13 +59325,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_560
-#AT_START_561
-at_fn_group_banner 561 'json.at:207' \
+#AT_STOP_561
+#AT_START_562
+at_fn_group_banner 562 'json.at:207' \
   "large integers that overflow to reals - Python" " " 38
 at_xfail=no
 (
-  $as_echo "561. $at_setup_line: testing $at_desc ..."
+  $as_echo "562. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59314,7 +59342,7 @@
 $as_echo "$at_srcdir/json.at:207: printf %s \"[9223372036854775807000, -92233720368547758080000]\" > input"
 at_fn_check_prepare_trace "json.at:207"
 ( $at_check_trace; printf %s "[9223372036854775807000, -92233720368547758080000]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59328,7 +59356,7 @@
 $as_echo "$at_srcdir/json.at:207: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:207"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59342,7 +59370,7 @@
 $as_echo "$at_srcdir/json.at:207: cat stdout"
 at_fn_check_prepare_trace "json.at:207"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59358,13 +59386,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_561
-#AT_START_562
-at_fn_group_banner 562 'json.at:212' \
+#AT_STOP_562
+#AT_START_563
+at_fn_group_banner 563 'json.at:212' \
   "negative zero - C" "                              " 38
 at_xfail=no
 (
-  $as_echo "562. $at_setup_line: testing $at_desc ..."
+  $as_echo "563. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59372,7 +59400,7 @@
 $as_echo "$at_srcdir/json.at:212: printf %s \"[-0, -0.0, 1e-9999, -1e-9999]\" > input"
 at_fn_check_prepare_trace "json.at:212"
 ( $at_check_trace; printf %s "[-0, -0.0, 1e-9999, -1e-9999]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59386,7 +59414,7 @@
 $as_echo "$at_srcdir/json.at:212: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:212"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59400,7 +59428,7 @@
 $as_echo "$at_srcdir/json.at:212: cat stdout"
 at_fn_check_prepare_trace "json.at:212"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59416,13 +59444,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_562
-#AT_START_563
-at_fn_group_banner 563 'json.at:212' \
+#AT_STOP_563
+#AT_START_564
+at_fn_group_banner 564 'json.at:212' \
   "negative zero - Python" "                         " 38
 at_xfail=no
 (
-  $as_echo "563. $at_setup_line: testing $at_desc ..."
+  $as_echo "564. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59433,7 +59461,7 @@
 $as_echo "$at_srcdir/json.at:212: printf %s \"[-0, -0.0, 1e-9999, -1e-9999]\" > input"
 at_fn_check_prepare_trace "json.at:212"
 ( $at_check_trace; printf %s "[-0, -0.0, 1e-9999, -1e-9999]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59447,7 +59475,7 @@
 $as_echo "$at_srcdir/json.at:212: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:212"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59461,7 +59489,7 @@
 $as_echo "$at_srcdir/json.at:212: cat stdout"
 at_fn_check_prepare_trace "json.at:212"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59477,13 +59505,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_563
-#AT_START_564
-at_fn_group_banner 564 'json.at:217' \
+#AT_STOP_564
+#AT_START_565
+at_fn_group_banner 565 'json.at:217' \
   "reals - C" "                                      " 38
 at_xfail=no
 (
-  $as_echo "564. $at_setup_line: testing $at_desc ..."
+  $as_echo "565. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59491,7 +59519,7 @@
 $as_echo "$at_srcdir/json.at:217: printf %s \"[0.0, 1.0, 2.0, 3.0, 3.5, 81.250]\" > input"
 at_fn_check_prepare_trace "json.at:217"
 ( $at_check_trace; printf %s "[0.0, 1.0, 2.0, 3.0, 3.5, 81.250]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59505,7 +59533,7 @@
 $as_echo "$at_srcdir/json.at:217: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:217"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59519,7 +59547,7 @@
 $as_echo "$at_srcdir/json.at:217: cat stdout"
 at_fn_check_prepare_trace "json.at:217"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59535,13 +59563,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_564
-#AT_START_565
-at_fn_group_banner 565 'json.at:217' \
+#AT_STOP_565
+#AT_START_566
+at_fn_group_banner 566 'json.at:217' \
   "reals - Python" "                                 " 38
 at_xfail=no
 (
-  $as_echo "565. $at_setup_line: testing $at_desc ..."
+  $as_echo "566. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59552,7 +59580,7 @@
 $as_echo "$at_srcdir/json.at:217: printf %s \"[0.0, 1.0, 2.0, 3.0, 3.5, 81.250]\" > input"
 at_fn_check_prepare_trace "json.at:217"
 ( $at_check_trace; printf %s "[0.0, 1.0, 2.0, 3.0, 3.5, 81.250]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59566,7 +59594,7 @@
 $as_echo "$at_srcdir/json.at:217: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:217"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59580,7 +59608,7 @@
 $as_echo "$at_srcdir/json.at:217: cat stdout"
 at_fn_check_prepare_trace "json.at:217"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59596,13 +59624,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_565
-#AT_START_566
-at_fn_group_banner 566 'json.at:221' \
+#AT_STOP_566
+#AT_START_567
+at_fn_group_banner 567 'json.at:221' \
   "scientific notation - C" "                        " 38
 at_xfail=no
 (
-  $as_echo "566. $at_setup_line: testing $at_desc ..."
+  $as_echo "567. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59610,7 +59638,7 @@
 $as_echo "$at_srcdir/json.at:221: printf %s \"[1e3, 1E3, 2.5E2, 1e+3, 125e-3, 3.125e-2, 3125e-05, 1.525878906e-5]\" > input"
 at_fn_check_prepare_trace "json.at:221"
 ( $at_check_trace; printf %s "[1e3, 1E3, 2.5E2, 1e+3, 125e-3, 3.125e-2, 3125e-05, 1.525878906e-5]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59624,7 +59652,7 @@
 $as_echo "$at_srcdir/json.at:221: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:221"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59638,7 +59666,7 @@
 $as_echo "$at_srcdir/json.at:221: cat stdout"
 at_fn_check_prepare_trace "json.at:221"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59654,13 +59682,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_566
-#AT_START_567
-at_fn_group_banner 567 'json.at:221' \
+#AT_STOP_567
+#AT_START_568
+at_fn_group_banner 568 'json.at:221' \
   "scientific notation - Python" "                   " 38
 at_xfail=no
 (
-  $as_echo "567. $at_setup_line: testing $at_desc ..."
+  $as_echo "568. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59671,7 +59699,7 @@
 $as_echo "$at_srcdir/json.at:221: printf %s \"[1e3, 1E3, 2.5E2, 1e+3, 125e-3, 3.125e-2, 3125e-05, 1.525878906e-5]\" > input"
 at_fn_check_prepare_trace "json.at:221"
 ( $at_check_trace; printf %s "[1e3, 1E3, 2.5E2, 1e+3, 125e-3, 3.125e-2, 3125e-05, 1.525878906e-5]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59685,7 +59713,7 @@
 $as_echo "$at_srcdir/json.at:221: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:221"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59699,7 +59727,7 @@
 $as_echo "$at_srcdir/json.at:221: cat stdout"
 at_fn_check_prepare_trace "json.at:221"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59715,13 +59743,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_567
-#AT_START_568
-at_fn_group_banner 568 'json.at:228' \
+#AT_STOP_568
+#AT_START_569
+at_fn_group_banner 569 'json.at:228' \
   "+/- DBL_MAX - C" "                                " 38
 at_xfail=no
 (
-  $as_echo "568. $at_setup_line: testing $at_desc ..."
+  $as_echo "569. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59729,7 +59757,7 @@
 $as_echo "$at_srcdir/json.at:228: printf %s \"[1.7976931348623157e+308, -1.7976931348623157e+308]\" > input"
 at_fn_check_prepare_trace "json.at:228"
 ( $at_check_trace; printf %s "[1.7976931348623157e+308, -1.7976931348623157e+308]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59743,7 +59771,7 @@
 $as_echo "$at_srcdir/json.at:228: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:228"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59757,7 +59785,7 @@
 $as_echo "$at_srcdir/json.at:228: cat stdout"
 at_fn_check_prepare_trace "json.at:228"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59773,13 +59801,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_568
-#AT_START_569
-at_fn_group_banner 569 'json.at:228' \
+#AT_STOP_569
+#AT_START_570
+at_fn_group_banner 570 'json.at:228' \
   "+/- DBL_MAX - Python" "                           " 38
 at_xfail=no
 (
-  $as_echo "569. $at_setup_line: testing $at_desc ..."
+  $as_echo "570. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59790,7 +59818,7 @@
 $as_echo "$at_srcdir/json.at:228: printf %s \"[1.7976931348623157e+308, -1.7976931348623157e+308]\" > input"
 at_fn_check_prepare_trace "json.at:228"
 ( $at_check_trace; printf %s "[1.7976931348623157e+308, -1.7976931348623157e+308]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59804,7 +59832,7 @@
 $as_echo "$at_srcdir/json.at:228: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:228"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59818,7 +59846,7 @@
 $as_echo "$at_srcdir/json.at:228: cat stdout"
 at_fn_check_prepare_trace "json.at:228"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59834,13 +59862,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_569
-#AT_START_570
-at_fn_group_banner 570 'json.at:233' \
+#AT_STOP_570
+#AT_START_571
+at_fn_group_banner 571 'json.at:233' \
   "negative reals - C" "                             " 38
 at_xfail=no
 (
-  $as_echo "570. $at_setup_line: testing $at_desc ..."
+  $as_echo "571. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59848,7 +59876,7 @@
 $as_echo "$at_srcdir/json.at:233: printf %s \"[-0, -1.0, -2.0, -3.0, -3.5, -8.1250]\" > input"
 at_fn_check_prepare_trace "json.at:233"
 ( $at_check_trace; printf %s "[-0, -1.0, -2.0, -3.0, -3.5, -8.1250]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59862,7 +59890,7 @@
 $as_echo "$at_srcdir/json.at:233: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:233"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59876,7 +59904,7 @@
 $as_echo "$at_srcdir/json.at:233: cat stdout"
 at_fn_check_prepare_trace "json.at:233"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59892,13 +59920,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_570
-#AT_START_571
-at_fn_group_banner 571 'json.at:233' \
+#AT_STOP_571
+#AT_START_572
+at_fn_group_banner 572 'json.at:233' \
   "negative reals - Python" "                        " 38
 at_xfail=no
 (
-  $as_echo "571. $at_setup_line: testing $at_desc ..."
+  $as_echo "572. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59909,7 +59937,7 @@
 $as_echo "$at_srcdir/json.at:233: printf %s \"[-0, -1.0, -2.0, -3.0, -3.5, -8.1250]\" > input"
 at_fn_check_prepare_trace "json.at:233"
 ( $at_check_trace; printf %s "[-0, -1.0, -2.0, -3.0, -3.5, -8.1250]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59923,7 +59951,7 @@
 $as_echo "$at_srcdir/json.at:233: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:233"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59937,7 +59965,7 @@
 $as_echo "$at_srcdir/json.at:233: cat stdout"
 at_fn_check_prepare_trace "json.at:233"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59953,13 +59981,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_571
-#AT_START_572
-at_fn_group_banner 572 'json.at:237' \
+#AT_STOP_572
+#AT_START_573
+at_fn_group_banner 573 'json.at:237' \
   "negative scientific notation - C" "               " 38
 at_xfail=no
 (
-  $as_echo "572. $at_setup_line: testing $at_desc ..."
+  $as_echo "573. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -59967,7 +59995,7 @@
 $as_echo "$at_srcdir/json.at:237: printf %s \"[-1e3, -1E3, -2.5E2, -1e+3, -125e-3, -3.125e-2, -3125e-05, -1.525878906e-5]\" > input"
 at_fn_check_prepare_trace "json.at:237"
 ( $at_check_trace; printf %s "[-1e3, -1E3, -2.5E2, -1e+3, -125e-3, -3.125e-2, -3125e-05, -1.525878906e-5]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59981,7 +60009,7 @@
 $as_echo "$at_srcdir/json.at:237: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:237"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -59995,7 +60023,7 @@
 $as_echo "$at_srcdir/json.at:237: cat stdout"
 at_fn_check_prepare_trace "json.at:237"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60011,13 +60039,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_572
-#AT_START_573
-at_fn_group_banner 573 'json.at:237' \
+#AT_STOP_573
+#AT_START_574
+at_fn_group_banner 574 'json.at:237' \
   "negative scientific notation - Python" "          " 38
 at_xfail=no
 (
-  $as_echo "573. $at_setup_line: testing $at_desc ..."
+  $as_echo "574. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60028,7 +60056,7 @@
 $as_echo "$at_srcdir/json.at:237: printf %s \"[-1e3, -1E3, -2.5E2, -1e+3, -125e-3, -3.125e-2, -3125e-05, -1.525878906e-5]\" > input"
 at_fn_check_prepare_trace "json.at:237"
 ( $at_check_trace; printf %s "[-1e3, -1E3, -2.5E2, -1e+3, -125e-3, -3.125e-2, -3125e-05, -1.525878906e-5]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60042,7 +60070,7 @@
 $as_echo "$at_srcdir/json.at:237: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:237"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60056,7 +60084,7 @@
 $as_echo "$at_srcdir/json.at:237: cat stdout"
 at_fn_check_prepare_trace "json.at:237"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60072,13 +60100,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_573
-#AT_START_574
-at_fn_group_banner 574 'json.at:241' \
+#AT_STOP_574
+#AT_START_575
+at_fn_group_banner 575 'json.at:241' \
   "1e-9999 underflows to 0 - C" "                    " 38
 at_xfail=no
 (
-  $as_echo "574. $at_setup_line: testing $at_desc ..."
+  $as_echo "575. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60086,7 +60114,7 @@
 $as_echo "$at_srcdir/json.at:241: printf %s \"[1e-9999]\" > input"
 at_fn_check_prepare_trace "json.at:241"
 ( $at_check_trace; printf %s "[1e-9999]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60100,7 +60128,7 @@
 $as_echo "$at_srcdir/json.at:241: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:241"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60114,7 +60142,7 @@
 $as_echo "$at_srcdir/json.at:241: cat stdout"
 at_fn_check_prepare_trace "json.at:241"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60130,13 +60158,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_574
-#AT_START_575
-at_fn_group_banner 575 'json.at:241' \
+#AT_STOP_575
+#AT_START_576
+at_fn_group_banner 576 'json.at:241' \
   "1e-9999 underflows to 0 - Python" "               " 38
 at_xfail=no
 (
-  $as_echo "575. $at_setup_line: testing $at_desc ..."
+  $as_echo "576. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60147,7 +60175,7 @@
 $as_echo "$at_srcdir/json.at:241: printf %s \"[1e-9999]\" > input"
 at_fn_check_prepare_trace "json.at:241"
 ( $at_check_trace; printf %s "[1e-9999]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60161,7 +60189,7 @@
 $as_echo "$at_srcdir/json.at:241: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:241"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60175,7 +60203,7 @@
 $as_echo "$at_srcdir/json.at:241: cat stdout"
 at_fn_check_prepare_trace "json.at:241"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60191,13 +60219,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_575
-#AT_START_576
-at_fn_group_banner 576 'json.at:245' \
+#AT_STOP_576
+#AT_START_577
+at_fn_group_banner 577 'json.at:245' \
   "a number by itself is not valid JSON - C" "       " 38
 at_xfail=no
 (
-  $as_echo "576. $at_setup_line: testing $at_desc ..."
+  $as_echo "577. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60205,7 +60233,7 @@
 $as_echo "$at_srcdir/json.at:245: printf %s \"1\" > input"
 at_fn_check_prepare_trace "json.at:245"
 ( $at_check_trace; printf %s "1" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60219,7 +60247,7 @@
 $as_echo "$at_srcdir/json.at:245: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:245"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60233,7 +60261,7 @@
 $as_echo "$at_srcdir/json.at:245: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:245"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60249,13 +60277,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_576
-#AT_START_577
-at_fn_group_banner 577 'json.at:245' \
+#AT_STOP_577
+#AT_START_578
+at_fn_group_banner 578 'json.at:245' \
   "a number by itself is not valid JSON - Python" "  " 38
 at_xfail=no
 (
-  $as_echo "577. $at_setup_line: testing $at_desc ..."
+  $as_echo "578. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60266,7 +60294,7 @@
 $as_echo "$at_srcdir/json.at:245: printf %s \"1\" > input"
 at_fn_check_prepare_trace "json.at:245"
 ( $at_check_trace; printf %s "1" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60280,7 +60308,7 @@
 $as_echo "$at_srcdir/json.at:245: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:245"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60294,7 +60322,7 @@
 $as_echo "$at_srcdir/json.at:245: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:245"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60310,13 +60338,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_577
-#AT_START_578
-at_fn_group_banner 578 'json.at:247' \
+#AT_STOP_578
+#AT_START_579
+at_fn_group_banner 579 'json.at:247' \
   "leading zeros not allowed - C" "                  " 38
 at_xfail=no
 (
-  $as_echo "578. $at_setup_line: testing $at_desc ..."
+  $as_echo "579. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60324,7 +60352,7 @@
 $as_echo "$at_srcdir/json.at:247: printf %s \"[0123]\" > input"
 at_fn_check_prepare_trace "json.at:247"
 ( $at_check_trace; printf %s "[0123]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60338,7 +60366,7 @@
 $as_echo "$at_srcdir/json.at:247: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:247"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60352,7 +60380,7 @@
 $as_echo "$at_srcdir/json.at:247: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:247"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60368,13 +60396,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_578
-#AT_START_579
-at_fn_group_banner 579 'json.at:247' \
+#AT_STOP_579
+#AT_START_580
+at_fn_group_banner 580 'json.at:247' \
   "leading zeros not allowed - Python" "             " 38
 at_xfail=no
 (
-  $as_echo "579. $at_setup_line: testing $at_desc ..."
+  $as_echo "580. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60385,7 +60413,7 @@
 $as_echo "$at_srcdir/json.at:247: printf %s \"[0123]\" > input"
 at_fn_check_prepare_trace "json.at:247"
 ( $at_check_trace; printf %s "[0123]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60399,7 +60427,7 @@
 $as_echo "$at_srcdir/json.at:247: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:247"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60413,7 +60441,7 @@
 $as_echo "$at_srcdir/json.at:247: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:247"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60429,13 +60457,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_579
-#AT_START_580
-at_fn_group_banner 580 'json.at:251' \
+#AT_STOP_580
+#AT_START_581
+at_fn_group_banner 581 'json.at:251' \
   "1e9999 is too big - C" "                          " 38
 at_xfail=no
 (
-  $as_echo "580. $at_setup_line: testing $at_desc ..."
+  $as_echo "581. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60443,7 +60471,7 @@
 $as_echo "$at_srcdir/json.at:251: printf %s \"[1e9999]\" > input"
 at_fn_check_prepare_trace "json.at:251"
 ( $at_check_trace; printf %s "[1e9999]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60457,7 +60485,7 @@
 $as_echo "$at_srcdir/json.at:251: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:251"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60471,7 +60499,7 @@
 $as_echo "$at_srcdir/json.at:251: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:251"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60487,13 +60515,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_580
-#AT_START_581
-at_fn_group_banner 581 'json.at:251' \
+#AT_STOP_581
+#AT_START_582
+at_fn_group_banner 582 'json.at:251' \
   "1e9999 is too big - Python" "                     " 38
 at_xfail=no
 (
-  $as_echo "581. $at_setup_line: testing $at_desc ..."
+  $as_echo "582. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60504,7 +60532,7 @@
 $as_echo "$at_srcdir/json.at:251: printf %s \"[1e9999]\" > input"
 at_fn_check_prepare_trace "json.at:251"
 ( $at_check_trace; printf %s "[1e9999]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60518,7 +60546,7 @@
 $as_echo "$at_srcdir/json.at:251: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:251"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60532,7 +60560,7 @@
 $as_echo "$at_srcdir/json.at:251: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:251"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60548,13 +60576,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_581
-#AT_START_582
-at_fn_group_banner 582 'json.at:255' \
+#AT_STOP_582
+#AT_START_583
+at_fn_group_banner 583 'json.at:255' \
   "exponent bigger than INT_MAX - C" "               " 38
 at_xfail=no
 (
-  $as_echo "582. $at_setup_line: testing $at_desc ..."
+  $as_echo "583. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60562,7 +60590,7 @@
 $as_echo "$at_srcdir/json.at:255: printf %s \"[1e9999999999999999999]\" > input"
 at_fn_check_prepare_trace "json.at:255"
 ( $at_check_trace; printf %s "[1e9999999999999999999]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60576,7 +60604,7 @@
 $as_echo "$at_srcdir/json.at:255: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:255"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60590,7 +60618,7 @@
 $as_echo "$at_srcdir/json.at:255: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:255"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60606,13 +60634,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_582
-#AT_START_583
-at_fn_group_banner 583 'json.at:255' \
+#AT_STOP_583
+#AT_START_584
+at_fn_group_banner 584 'json.at:255' \
   "exponent bigger than INT_MAX - Python" "          " 38
 at_xfail=no
 (
-  $as_echo "583. $at_setup_line: testing $at_desc ..."
+  $as_echo "584. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60623,7 +60651,7 @@
 $as_echo "$at_srcdir/json.at:255: printf %s \"[1e9999999999999999999]\" > input"
 at_fn_check_prepare_trace "json.at:255"
 ( $at_check_trace; printf %s "[1e9999999999999999999]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60637,7 +60665,7 @@
 $as_echo "$at_srcdir/json.at:255: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:255"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60651,7 +60679,7 @@
 $as_echo "$at_srcdir/json.at:255: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:255"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60667,13 +60695,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_583
-#AT_START_584
-at_fn_group_banner 584 'json.at:259' \
+#AT_STOP_584
+#AT_START_585
+at_fn_group_banner 585 'json.at:259' \
   "decimal point must be followed by digit - C" "    " 38
 at_xfail=no
 (
-  $as_echo "584. $at_setup_line: testing $at_desc ..."
+  $as_echo "585. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60681,7 +60709,7 @@
 $as_echo "$at_srcdir/json.at:259: printf %s \"[1.]\" > input"
 at_fn_check_prepare_trace "json.at:259"
 ( $at_check_trace; printf %s "[1.]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60695,7 +60723,7 @@
 $as_echo "$at_srcdir/json.at:259: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:259"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60709,7 +60737,7 @@
 $as_echo "$at_srcdir/json.at:259: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:259"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60725,13 +60753,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_584
-#AT_START_585
-at_fn_group_banner 585 'json.at:259' \
+#AT_STOP_585
+#AT_START_586
+at_fn_group_banner 586 'json.at:259' \
   "decimal point must be followed by digit - Python" "" 38
 at_xfail=no
 (
-  $as_echo "585. $at_setup_line: testing $at_desc ..."
+  $as_echo "586. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60742,7 +60770,7 @@
 $as_echo "$at_srcdir/json.at:259: printf %s \"[1.]\" > input"
 at_fn_check_prepare_trace "json.at:259"
 ( $at_check_trace; printf %s "[1.]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60756,7 +60784,7 @@
 $as_echo "$at_srcdir/json.at:259: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:259"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60770,7 +60798,7 @@
 $as_echo "$at_srcdir/json.at:259: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:259"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60786,13 +60814,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_585
-#AT_START_586
-at_fn_group_banner 586 'json.at:263' \
+#AT_STOP_586
+#AT_START_587
+at_fn_group_banner 587 'json.at:263' \
   "exponent must contain at least one digit (1) - C" "" 38
 at_xfail=no
 (
-  $as_echo "586. $at_setup_line: testing $at_desc ..."
+  $as_echo "587. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60800,7 +60828,7 @@
 $as_echo "$at_srcdir/json.at:263: printf %s \"[1e]\" > input"
 at_fn_check_prepare_trace "json.at:263"
 ( $at_check_trace; printf %s "[1e]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60814,7 +60842,7 @@
 $as_echo "$at_srcdir/json.at:263: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:263"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60828,7 +60856,7 @@
 $as_echo "$at_srcdir/json.at:263: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:263"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60844,13 +60872,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_586
-#AT_START_587
-at_fn_group_banner 587 'json.at:263' \
+#AT_STOP_587
+#AT_START_588
+at_fn_group_banner 588 'json.at:263' \
   "exponent must contain at least one digit (1) - Python" "" 38
 at_xfail=no
 (
-  $as_echo "587. $at_setup_line: testing $at_desc ..."
+  $as_echo "588. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60861,7 +60889,7 @@
 $as_echo "$at_srcdir/json.at:263: printf %s \"[1e]\" > input"
 at_fn_check_prepare_trace "json.at:263"
 ( $at_check_trace; printf %s "[1e]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60875,7 +60903,7 @@
 $as_echo "$at_srcdir/json.at:263: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:263"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60889,7 +60917,7 @@
 $as_echo "$at_srcdir/json.at:263: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:263"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60905,13 +60933,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_587
-#AT_START_588
-at_fn_group_banner 588 'json.at:267' \
+#AT_STOP_588
+#AT_START_589
+at_fn_group_banner 589 'json.at:267' \
   "exponent must contain at least one digit (2) - C" "" 38
 at_xfail=no
 (
-  $as_echo "588. $at_setup_line: testing $at_desc ..."
+  $as_echo "589. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60919,7 +60947,7 @@
 $as_echo "$at_srcdir/json.at:267: printf %s \"[1e+]\" > input"
 at_fn_check_prepare_trace "json.at:267"
 ( $at_check_trace; printf %s "[1e+]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60933,7 +60961,7 @@
 $as_echo "$at_srcdir/json.at:267: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:267"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60947,7 +60975,7 @@
 $as_echo "$at_srcdir/json.at:267: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:267"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60963,13 +60991,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_588
-#AT_START_589
-at_fn_group_banner 589 'json.at:267' \
+#AT_STOP_589
+#AT_START_590
+at_fn_group_banner 590 'json.at:267' \
   "exponent must contain at least one digit (2) - Python" "" 38
 at_xfail=no
 (
-  $as_echo "589. $at_setup_line: testing $at_desc ..."
+  $as_echo "590. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -60980,7 +61008,7 @@
 $as_echo "$at_srcdir/json.at:267: printf %s \"[1e+]\" > input"
 at_fn_check_prepare_trace "json.at:267"
 ( $at_check_trace; printf %s "[1e+]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -60994,7 +61022,7 @@
 $as_echo "$at_srcdir/json.at:267: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:267"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61008,7 +61036,7 @@
 $as_echo "$at_srcdir/json.at:267: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:267"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61024,13 +61052,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_589
-#AT_START_590
-at_fn_group_banner 590 'json.at:271' \
+#AT_STOP_590
+#AT_START_591
+at_fn_group_banner 591 'json.at:271' \
   "exponent must contain at least one digit (3) - C" "" 38
 at_xfail=no
 (
-  $as_echo "590. $at_setup_line: testing $at_desc ..."
+  $as_echo "591. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61038,7 +61066,7 @@
 $as_echo "$at_srcdir/json.at:271: printf %s \"[1e-]\" > input"
 at_fn_check_prepare_trace "json.at:271"
 ( $at_check_trace; printf %s "[1e-]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61052,7 +61080,7 @@
 $as_echo "$at_srcdir/json.at:271: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:271"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61066,7 +61094,7 @@
 $as_echo "$at_srcdir/json.at:271: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:271"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61082,13 +61110,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_590
-#AT_START_591
-at_fn_group_banner 591 'json.at:271' \
+#AT_STOP_591
+#AT_START_592
+at_fn_group_banner 592 'json.at:271' \
   "exponent must contain at least one digit (3) - Python" "" 38
 at_xfail=no
 (
-  $as_echo "591. $at_setup_line: testing $at_desc ..."
+  $as_echo "592. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61099,7 +61127,7 @@
 $as_echo "$at_srcdir/json.at:271: printf %s \"[1e-]\" > input"
 at_fn_check_prepare_trace "json.at:271"
 ( $at_check_trace; printf %s "[1e-]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61113,7 +61141,7 @@
 $as_echo "$at_srcdir/json.at:271: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:271"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61127,7 +61155,7 @@
 $as_echo "$at_srcdir/json.at:271: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:271"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61143,13 +61171,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_591
-#AT_START_592
-at_fn_group_banner 592 'json.at:278' \
+#AT_STOP_592
+#AT_START_593
+at_fn_group_banner 593 'json.at:278' \
   "RFC 4267 object example - C" "                    " 39
 at_xfail=no
 (
-  $as_echo "592. $at_setup_line: testing $at_desc ..."
+  $as_echo "593. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61181,7 +61209,7 @@
        \"IDs\": [116, 943, 234, 38793]
      }
 }" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61195,7 +61223,7 @@
 $as_echo "$at_srcdir/json.at:278: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:278"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61209,7 +61237,7 @@
 $as_echo "$at_srcdir/json.at:278: cat stdout"
 at_fn_check_prepare_trace "json.at:278"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61225,13 +61253,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_592
-#AT_START_593
-at_fn_group_banner 593 'json.at:278' \
+#AT_STOP_593
+#AT_START_594
+at_fn_group_banner 594 'json.at:278' \
   "RFC 4267 object example - Python" "               " 39
 at_xfail=no
 (
-  $as_echo "593. $at_setup_line: testing $at_desc ..."
+  $as_echo "594. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61266,7 +61294,7 @@
        \"IDs\": [116, 943, 234, 38793]
      }
 }" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61280,7 +61308,7 @@
 $as_echo "$at_srcdir/json.at:278: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:278"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61294,7 +61322,7 @@
 $as_echo "$at_srcdir/json.at:278: cat stdout"
 at_fn_check_prepare_trace "json.at:278"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61310,13 +61338,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_593
-#AT_START_594
-at_fn_group_banner 594 'json.at:294' \
+#AT_STOP_594
+#AT_START_595
+at_fn_group_banner 595 'json.at:294' \
   "RFC 4267 array example - C" "                     " 39
 at_xfail=no
 (
-  $as_echo "594. $at_setup_line: testing $at_desc ..."
+  $as_echo "595. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61366,7 +61394,7 @@
       \"Country\":   \"US\"
    }
 ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61380,7 +61408,7 @@
 $as_echo "$at_srcdir/json.at:294: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:294"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61394,7 +61422,7 @@
 $as_echo "$at_srcdir/json.at:294: cat stdout"
 at_fn_check_prepare_trace "json.at:294"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61410,13 +61438,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_594
-#AT_START_595
-at_fn_group_banner 595 'json.at:294' \
+#AT_STOP_595
+#AT_START_596
+at_fn_group_banner 596 'json.at:294' \
   "RFC 4267 array example - Python" "                " 39
 at_xfail=no
 (
-  $as_echo "595. $at_setup_line: testing $at_desc ..."
+  $as_echo "596. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61469,7 +61497,7 @@
       \"Country\":   \"US\"
    }
 ]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61483,7 +61511,7 @@
 $as_echo "$at_srcdir/json.at:294: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:294"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61497,7 +61525,7 @@
 $as_echo "$at_srcdir/json.at:294: cat stdout"
 at_fn_check_prepare_trace "json.at:294"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61513,13 +61541,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_595
-#AT_START_596
-at_fn_group_banner 596 'json.at:321' \
+#AT_STOP_596
+#AT_START_597
+at_fn_group_banner 597 'json.at:321' \
   "trailing garbage - C" "                           " 40
 at_xfail=no
 (
-  $as_echo "596. $at_setup_line: testing $at_desc ..."
+  $as_echo "597. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61527,7 +61555,7 @@
 $as_echo "$at_srcdir/json.at:321: printf %s \"[1]null\" > input"
 at_fn_check_prepare_trace "json.at:321"
 ( $at_check_trace; printf %s "[1]null" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61541,7 +61569,7 @@
 $as_echo "$at_srcdir/json.at:321: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:321"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61555,7 +61583,7 @@
 $as_echo "$at_srcdir/json.at:321: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:321"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61571,13 +61599,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_596
-#AT_START_597
-at_fn_group_banner 597 'json.at:321' \
+#AT_STOP_597
+#AT_START_598
+at_fn_group_banner 598 'json.at:321' \
   "trailing garbage - Python" "                      " 40
 at_xfail=no
 (
-  $as_echo "597. $at_setup_line: testing $at_desc ..."
+  $as_echo "598. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61588,7 +61616,7 @@
 $as_echo "$at_srcdir/json.at:321: printf %s \"[1]null\" > input"
 at_fn_check_prepare_trace "json.at:321"
 ( $at_check_trace; printf %s "[1]null" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61602,7 +61630,7 @@
 $as_echo "$at_srcdir/json.at:321: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:321"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61616,7 +61644,7 @@
 $as_echo "$at_srcdir/json.at:321: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:321"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61632,13 +61660,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_597
-#AT_START_598
-at_fn_group_banner 598 'json.at:323' \
+#AT_STOP_598
+#AT_START_599
+at_fn_group_banner 599 'json.at:323' \
   "formfeeds are not valid white space - C" "        " 40
 at_xfail=no
 (
-  $as_echo "598. $at_setup_line: testing $at_desc ..."
+  $as_echo "599. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61646,7 +61674,7 @@
 $as_echo "$at_srcdir/json.at:323: printf %s \"[]\" > input"
 at_fn_check_prepare_trace "json.at:323"
 ( $at_check_trace; printf %s "[]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61660,7 +61688,7 @@
 $as_echo "$at_srcdir/json.at:323: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:323"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61674,7 +61702,7 @@
 $as_echo "$at_srcdir/json.at:323: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:323"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61690,13 +61718,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_598
-#AT_START_599
-at_fn_group_banner 599 'json.at:323' \
+#AT_STOP_599
+#AT_START_600
+at_fn_group_banner 600 'json.at:323' \
   "formfeeds are not valid white space - Python" "   " 40
 at_xfail=no
 (
-  $as_echo "599. $at_setup_line: testing $at_desc ..."
+  $as_echo "600. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61707,7 +61735,7 @@
 $as_echo "$at_srcdir/json.at:323: printf %s \"[]\" > input"
 at_fn_check_prepare_trace "json.at:323"
 ( $at_check_trace; printf %s "[]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61721,7 +61749,7 @@
 $as_echo "$at_srcdir/json.at:323: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:323"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61735,7 +61763,7 @@
 $as_echo "$at_srcdir/json.at:323: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:323"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61751,13 +61779,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_599
-#AT_START_600
-at_fn_group_banner 600 'json.at:325' \
+#AT_STOP_600
+#AT_START_601
+at_fn_group_banner 601 'json.at:325' \
   "';' is not a valid token - C" "                   " 40
 at_xfail=no
 (
-  $as_echo "600. $at_setup_line: testing $at_desc ..."
+  $as_echo "601. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61765,7 +61793,7 @@
 $as_echo "$at_srcdir/json.at:325: printf %s \";\" > input"
 at_fn_check_prepare_trace "json.at:325"
 ( $at_check_trace; printf %s ";" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61779,7 +61807,7 @@
 $as_echo "$at_srcdir/json.at:325: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:325"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61793,7 +61821,7 @@
 $as_echo "$at_srcdir/json.at:325: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:325"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61809,13 +61837,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_600
-#AT_START_601
-at_fn_group_banner 601 'json.at:325' \
+#AT_STOP_601
+#AT_START_602
+at_fn_group_banner 602 'json.at:325' \
   "';' is not a valid token - Python" "              " 40
 at_xfail=no
 (
-  $as_echo "601. $at_setup_line: testing $at_desc ..."
+  $as_echo "602. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61826,7 +61854,7 @@
 $as_echo "$at_srcdir/json.at:325: printf %s \";\" > input"
 at_fn_check_prepare_trace "json.at:325"
 ( $at_check_trace; printf %s ";" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61840,7 +61868,7 @@
 $as_echo "$at_srcdir/json.at:325: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:325"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61854,7 +61882,7 @@
 $as_echo "$at_srcdir/json.at:325: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:325"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61870,13 +61898,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_601
-#AT_START_602
-at_fn_group_banner 602 'json.at:327' \
+#AT_STOP_602
+#AT_START_603
+at_fn_group_banner 603 'json.at:327' \
   "arrays nesting too deep - C" "                    " 40
 at_xfail=no
 (
-  $as_echo "602. $at_setup_line: testing $at_desc ..."
+  $as_echo "603. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61884,7 +61912,7 @@
 $as_echo "$at_srcdir/json.at:327: printf %s \"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[                     ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]\" > input"
 at_fn_check_prepare_trace "json.at:327"
 ( $at_check_trace; printf %s "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[                     ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61898,7 +61926,7 @@
 $as_echo "$at_srcdir/json.at:327: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:327"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61912,7 +61940,7 @@
 $as_echo "$at_srcdir/json.at:327: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:327"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61928,13 +61956,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_602
-#AT_START_603
-at_fn_group_banner 603 'json.at:327' \
+#AT_STOP_603
+#AT_START_604
+at_fn_group_banner 604 'json.at:327' \
   "arrays nesting too deep - Python" "               " 40
 at_xfail=no
 (
-  $as_echo "603. $at_setup_line: testing $at_desc ..."
+  $as_echo "604. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -61945,7 +61973,7 @@
 $as_echo "$at_srcdir/json.at:327: printf %s \"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[                     ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]\" > input"
 at_fn_check_prepare_trace "json.at:327"
 ( $at_check_trace; printf %s "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[                     ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61959,7 +61987,7 @@
 $as_echo "$at_srcdir/json.at:327: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:327"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61973,7 +62001,7 @@
 $as_echo "$at_srcdir/json.at:327: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:327"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -61989,13 +62017,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_603
-#AT_START_604
-at_fn_group_banner 604 'json.at:331' \
+#AT_STOP_604
+#AT_START_605
+at_fn_group_banner 605 'json.at:331' \
   "objects nesting too deep - C" "                   " 40
 at_xfail=no
 (
-  $as_echo "604. $at_setup_line: testing $at_desc ..."
+  $as_echo "605. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62003,7 +62031,7 @@
 $as_echo "$at_srcdir/json.at:331: printf %s \"{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":                     }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}\" > input"
 at_fn_check_prepare_trace "json.at:331"
 ( $at_check_trace; printf %s "{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":                     }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62017,7 +62045,7 @@
 $as_echo "$at_srcdir/json.at:331: ovstest test-json  input"
 at_fn_check_prepare_trace "json.at:331"
 ( $at_check_trace; ovstest test-json  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62031,7 +62059,7 @@
 $as_echo "$at_srcdir/json.at:331: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:331"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62047,13 +62075,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_604
-#AT_START_605
-at_fn_group_banner 605 'json.at:331' \
+#AT_STOP_605
+#AT_START_606
+at_fn_group_banner 606 'json.at:331' \
   "objects nesting too deep - Python" "              " 40
 at_xfail=no
 (
-  $as_echo "605. $at_setup_line: testing $at_desc ..."
+  $as_echo "606. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62064,7 +62092,7 @@
 $as_echo "$at_srcdir/json.at:331: printf %s \"{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":{\\\"x\\\":                     }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}\" > input"
 at_fn_check_prepare_trace "json.at:331"
 ( $at_check_trace; printf %s "{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":{\"x\":                     }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62078,7 +62106,7 @@
 $as_echo "$at_srcdir/json.at:331: \$PYTHON \$srcdir/test-json.py  input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py  input" "json.at:331"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py  input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62092,7 +62120,7 @@
 $as_echo "$at_srcdir/json.at:331: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:331"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62108,13 +62136,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_605
-#AT_START_606
-at_fn_group_banner 606 'json.at:336' \
+#AT_STOP_606
+#AT_START_607
+at_fn_group_banner 607 'json.at:336' \
   "input may not be empty" "                         " 40
 at_xfail=no
 (
-  $as_echo "606. $at_setup_line: testing $at_desc ..."
+  $as_echo "607. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62122,7 +62150,7 @@
 $as_echo "$at_srcdir/json.at:338: ovstest test-json /dev/null"
 at_fn_check_prepare_trace "json.at:338"
 ( $at_check_trace; ovstest test-json /dev/null
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62137,13 +62165,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_606
-#AT_START_607
-at_fn_group_banner 607 'json.at:344' \
+#AT_STOP_607
+#AT_START_608
+at_fn_group_banner 608 'json.at:344' \
   "multiple adjacent objects - C" "                  " 41
 at_xfail=no
 (
-  $as_echo "607. $at_setup_line: testing $at_desc ..."
+  $as_echo "608. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62151,7 +62179,7 @@
 $as_echo "$at_srcdir/json.at:344: printf %s \"{}{}{}\" > input"
 at_fn_check_prepare_trace "json.at:344"
 ( $at_check_trace; printf %s "{}{}{}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62165,7 +62193,7 @@
 $as_echo "$at_srcdir/json.at:344: ovstest test-json --multiple input"
 at_fn_check_prepare_trace "json.at:344"
 ( $at_check_trace; ovstest test-json --multiple input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62179,7 +62207,7 @@
 $as_echo "$at_srcdir/json.at:344: cat stdout"
 at_fn_check_prepare_trace "json.at:344"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62197,13 +62225,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_607
-#AT_START_608
-at_fn_group_banner 608 'json.at:344' \
+#AT_STOP_608
+#AT_START_609
+at_fn_group_banner 609 'json.at:344' \
   "multiple adjacent objects - Python" "             " 41
 at_xfail=no
 (
-  $as_echo "608. $at_setup_line: testing $at_desc ..."
+  $as_echo "609. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62214,7 +62242,7 @@
 $as_echo "$at_srcdir/json.at:344: printf %s \"{}{}{}\" > input"
 at_fn_check_prepare_trace "json.at:344"
 ( $at_check_trace; printf %s "{}{}{}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62228,7 +62256,7 @@
 $as_echo "$at_srcdir/json.at:344: \$PYTHON \$srcdir/test-json.py --multiple input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py --multiple input" "json.at:344"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py --multiple input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62242,7 +62270,7 @@
 $as_echo "$at_srcdir/json.at:344: cat stdout"
 at_fn_check_prepare_trace "json.at:344"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62260,13 +62288,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_608
-#AT_START_609
-at_fn_group_banner 609 'json.at:349' \
+#AT_STOP_609
+#AT_START_610
+at_fn_group_banner 610 'json.at:349' \
   "multiple space-separated objects - C" "           " 41
 at_xfail=no
 (
-  $as_echo "609. $at_setup_line: testing $at_desc ..."
+  $as_echo "610. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62274,7 +62302,7 @@
 $as_echo "$at_srcdir/json.at:349: printf %s \"{}  {}  {}\" > input"
 at_fn_check_prepare_trace "json.at:349"
 ( $at_check_trace; printf %s "{}  {}  {}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62288,7 +62316,7 @@
 $as_echo "$at_srcdir/json.at:349: ovstest test-json --multiple input"
 at_fn_check_prepare_trace "json.at:349"
 ( $at_check_trace; ovstest test-json --multiple input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62302,7 +62330,7 @@
 $as_echo "$at_srcdir/json.at:349: cat stdout"
 at_fn_check_prepare_trace "json.at:349"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62320,13 +62348,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_609
-#AT_START_610
-at_fn_group_banner 610 'json.at:349' \
+#AT_STOP_610
+#AT_START_611
+at_fn_group_banner 611 'json.at:349' \
   "multiple space-separated objects - Python" "      " 41
 at_xfail=no
 (
-  $as_echo "610. $at_setup_line: testing $at_desc ..."
+  $as_echo "611. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62337,7 +62365,7 @@
 $as_echo "$at_srcdir/json.at:349: printf %s \"{}  {}  {}\" > input"
 at_fn_check_prepare_trace "json.at:349"
 ( $at_check_trace; printf %s "{}  {}  {}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62351,7 +62379,7 @@
 $as_echo "$at_srcdir/json.at:349: \$PYTHON \$srcdir/test-json.py --multiple input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py --multiple input" "json.at:349"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py --multiple input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62365,7 +62393,7 @@
 $as_echo "$at_srcdir/json.at:349: cat stdout"
 at_fn_check_prepare_trace "json.at:349"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62383,13 +62411,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_610
-#AT_START_611
-at_fn_group_banner 611 'json.at:354' \
+#AT_STOP_611
+#AT_START_612
+at_fn_group_banner 612 'json.at:354' \
   "multiple objects on separate lines - C" "         " 41
 at_xfail=no
 (
-  $as_echo "611. $at_setup_line: testing $at_desc ..."
+  $as_echo "612. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62401,7 +62429,7 @@
 ( $at_check_trace; printf %s "{}
 {}
 {}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62415,7 +62443,7 @@
 $as_echo "$at_srcdir/json.at:354: ovstest test-json --multiple input"
 at_fn_check_prepare_trace "json.at:354"
 ( $at_check_trace; ovstest test-json --multiple input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62429,7 +62457,7 @@
 $as_echo "$at_srcdir/json.at:354: cat stdout"
 at_fn_check_prepare_trace "json.at:354"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62447,13 +62475,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_611
-#AT_START_612
-at_fn_group_banner 612 'json.at:354' \
+#AT_STOP_612
+#AT_START_613
+at_fn_group_banner 613 'json.at:354' \
   "multiple objects on separate lines - Python" "    " 41
 at_xfail=no
 (
-  $as_echo "612. $at_setup_line: testing $at_desc ..."
+  $as_echo "613. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62468,7 +62496,7 @@
 ( $at_check_trace; printf %s "{}
 {}
 {}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62482,7 +62510,7 @@
 $as_echo "$at_srcdir/json.at:354: \$PYTHON \$srcdir/test-json.py --multiple input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py --multiple input" "json.at:354"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py --multiple input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62496,7 +62524,7 @@
 $as_echo "$at_srcdir/json.at:354: cat stdout"
 at_fn_check_prepare_trace "json.at:354"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62514,13 +62542,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_612
-#AT_START_613
-at_fn_group_banner 613 'json.at:361' \
+#AT_STOP_613
+#AT_START_614
+at_fn_group_banner 614 'json.at:361' \
   "multiple objects and arrays - C" "                " 41
 at_xfail=no
 (
-  $as_echo "613. $at_setup_line: testing $at_desc ..."
+  $as_echo "614. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62528,7 +62556,7 @@
 $as_echo "$at_srcdir/json.at:361: printf %s \"{}[]{}[]\" > input"
 at_fn_check_prepare_trace "json.at:361"
 ( $at_check_trace; printf %s "{}[]{}[]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62542,7 +62570,7 @@
 $as_echo "$at_srcdir/json.at:361: ovstest test-json --multiple input"
 at_fn_check_prepare_trace "json.at:361"
 ( $at_check_trace; ovstest test-json --multiple input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62556,7 +62584,7 @@
 $as_echo "$at_srcdir/json.at:361: cat stdout"
 at_fn_check_prepare_trace "json.at:361"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62575,13 +62603,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_613
-#AT_START_614
-at_fn_group_banner 614 'json.at:361' \
+#AT_STOP_614
+#AT_START_615
+at_fn_group_banner 615 'json.at:361' \
   "multiple objects and arrays - Python" "           " 41
 at_xfail=no
 (
-  $as_echo "614. $at_setup_line: testing $at_desc ..."
+  $as_echo "615. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62592,7 +62620,7 @@
 $as_echo "$at_srcdir/json.at:361: printf %s \"{}[]{}[]\" > input"
 at_fn_check_prepare_trace "json.at:361"
 ( $at_check_trace; printf %s "{}[]{}[]" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62606,7 +62634,7 @@
 $as_echo "$at_srcdir/json.at:361: \$PYTHON \$srcdir/test-json.py --multiple input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py --multiple input" "json.at:361"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py --multiple input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62620,7 +62648,7 @@
 $as_echo "$at_srcdir/json.at:361: cat stdout"
 at_fn_check_prepare_trace "json.at:361"
 ( $at_check_trace; cat stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62639,13 +62667,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_614
-#AT_START_615
-at_fn_group_banner 615 'json.at:367' \
+#AT_STOP_615
+#AT_START_616
+at_fn_group_banner 616 'json.at:367' \
   "garbage between multiple objects - C" "           " 41
 at_xfail=no
 (
-  $as_echo "615. $at_setup_line: testing $at_desc ..."
+  $as_echo "616. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62653,7 +62681,7 @@
 $as_echo "$at_srcdir/json.at:367: printf %s \"{}x{}\" > input"
 at_fn_check_prepare_trace "json.at:367"
 ( $at_check_trace; printf %s "{}x{}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62667,7 +62695,7 @@
 $as_echo "$at_srcdir/json.at:367: ovstest test-json --multiple input"
 at_fn_check_prepare_trace "json.at:367"
 ( $at_check_trace; ovstest test-json --multiple input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62681,7 +62709,7 @@
 $as_echo "$at_srcdir/json.at:367: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:367"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62699,13 +62727,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_615
-#AT_START_616
-at_fn_group_banner 616 'json.at:367' \
+#AT_STOP_616
+#AT_START_617
+at_fn_group_banner 617 'json.at:367' \
   "garbage between multiple objects - Python" "      " 41
 at_xfail=no
 (
-  $as_echo "616. $at_setup_line: testing $at_desc ..."
+  $as_echo "617. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62716,7 +62744,7 @@
 $as_echo "$at_srcdir/json.at:367: printf %s \"{}x{}\" > input"
 at_fn_check_prepare_trace "json.at:367"
 ( $at_check_trace; printf %s "{}x{}" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62730,7 +62758,7 @@
 $as_echo "$at_srcdir/json.at:367: \$PYTHON \$srcdir/test-json.py --multiple input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py --multiple input" "json.at:367"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py --multiple input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62744,7 +62772,7 @@
 $as_echo "$at_srcdir/json.at:367: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:367"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62762,13 +62790,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_616
-#AT_START_617
-at_fn_group_banner 617 'json.at:371' \
+#AT_STOP_617
+#AT_START_618
+at_fn_group_banner 618 'json.at:371' \
   "garbage after multiple objects - C" "             " 41
 at_xfail=no
 (
-  $as_echo "617. $at_setup_line: testing $at_desc ..."
+  $as_echo "618. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62776,7 +62804,7 @@
 $as_echo "$at_srcdir/json.at:371: printf %s \"{}{}x\" > input"
 at_fn_check_prepare_trace "json.at:371"
 ( $at_check_trace; printf %s "{}{}x" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62790,7 +62818,7 @@
 $as_echo "$at_srcdir/json.at:371: ovstest test-json --multiple input"
 at_fn_check_prepare_trace "json.at:371"
 ( $at_check_trace; ovstest test-json --multiple input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62804,7 +62832,7 @@
 $as_echo "$at_srcdir/json.at:371: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:371"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62822,13 +62850,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_617
-#AT_START_618
-at_fn_group_banner 618 'json.at:371' \
+#AT_STOP_618
+#AT_START_619
+at_fn_group_banner 619 'json.at:371' \
   "garbage after multiple objects - Python" "        " 41
 at_xfail=no
 (
-  $as_echo "618. $at_setup_line: testing $at_desc ..."
+  $as_echo "619. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -62839,7 +62867,7 @@
 $as_echo "$at_srcdir/json.at:371: printf %s \"{}{}x\" > input"
 at_fn_check_prepare_trace "json.at:371"
 ( $at_check_trace; printf %s "{}{}x" > input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62853,7 +62881,7 @@
 $as_echo "$at_srcdir/json.at:371: \$PYTHON \$srcdir/test-json.py --multiple input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-json.py --multiple input" "json.at:371"
 ( $at_check_trace; $PYTHON $srcdir/test-json.py --multiple input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62867,7 +62895,7 @@
 $as_echo "$at_srcdir/json.at:371: sed 's/^error: [^:]*:/error:/' < stdout"
 at_fn_check_prepare_trace "json.at:371"
 ( $at_check_trace; sed 's/^error: [^:]*:/error:/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62885,13 +62913,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_618
-#AT_START_619
-at_fn_group_banner 619 'jsonrpc.at:3' \
+#AT_STOP_619
+#AT_START_620
+at_fn_group_banner 620 'jsonrpc.at:3' \
   "JSON-RPC request and successful reply" "          " 42
 at_xfail=no
 (
-  $as_echo "619. $at_setup_line: testing $at_desc ..."
+  $as_echo "620. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -62899,7 +62927,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:5: ovstest test-jsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/pid listen punix:socket"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc.at:5"
 ( $at_check_trace; ovstest test-jsonrpc --detach --no-chdir --pidfile="`pwd`"/pid listen punix:socket
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62912,7 +62940,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:6: test -s pid"
 at_fn_check_prepare_trace "jsonrpc.at:6"
 ( $at_check_trace; test -s pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62925,7 +62953,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:7: kill -0 \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc.at:7"
 ( $at_check_trace; kill -0 `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62938,7 +62966,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:8: ovstest test-jsonrpc request unix:socket echo '[{\"a\": \"b\", \"x\": null}]'"
 at_fn_check_prepare_trace "jsonrpc.at:8"
 ( $at_check_trace; ovstest test-jsonrpc request unix:socket echo '[{"a": "b", "x": null}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62956,7 +62984,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:12: kill \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc.at:12"
 ( $at_check_trace; kill `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62969,13 +62997,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_619
-#AT_START_620
-at_fn_group_banner 620 'jsonrpc.at:15' \
+#AT_STOP_620
+#AT_START_621
+at_fn_group_banner 621 'jsonrpc.at:15' \
   "JSON-RPC request and error reply" "               " 42
 at_xfail=no
 (
-  $as_echo "620. $at_setup_line: testing $at_desc ..."
+  $as_echo "621. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -62983,7 +63011,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:17: ovstest test-jsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/pid listen punix:socket"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc.at:17"
 ( $at_check_trace; ovstest test-jsonrpc --detach --no-chdir --pidfile="`pwd`"/pid listen punix:socket
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -62996,7 +63024,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:18: test -s pid"
 at_fn_check_prepare_trace "jsonrpc.at:18"
 ( $at_check_trace; test -s pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63009,7 +63037,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:19: kill -0 \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc.at:19"
 ( $at_check_trace; kill -0 `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63022,7 +63050,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:20: ovstest test-jsonrpc request unix:socket bad-request '[]'"
 at_fn_check_prepare_trace "jsonrpc.at:20"
 ( $at_check_trace; ovstest test-jsonrpc request unix:socket bad-request '[]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63040,7 +63068,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:24: kill \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc.at:24"
 ( $at_check_trace; kill `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63053,13 +63081,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_620
-#AT_START_621
-at_fn_group_banner 621 'jsonrpc.at:27' \
+#AT_STOP_621
+#AT_START_622
+at_fn_group_banner 622 'jsonrpc.at:27' \
   "JSON-RPC notification" "                          " 42
 at_xfail=no
 (
-  $as_echo "621. $at_setup_line: testing $at_desc ..."
+  $as_echo "622. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -63067,7 +63095,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:29: ovstest test-jsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/pid listen punix:socket"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc.at:29"
 ( $at_check_trace; ovstest test-jsonrpc --detach --no-chdir --pidfile="`pwd`"/pid listen punix:socket
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63080,7 +63108,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:30: test -s pid"
 at_fn_check_prepare_trace "jsonrpc.at:30"
 ( $at_check_trace; test -s pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63094,7 +63122,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:32: cp pid pid2"
 at_fn_check_prepare_trace "jsonrpc.at:32"
 ( $at_check_trace; cp pid pid2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63107,7 +63135,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:33: kill -0 \`cat pid2\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc.at:33"
 ( $at_check_trace; kill -0 `cat pid2`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63120,7 +63148,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:34: ovstest test-jsonrpc notify unix:socket shutdown '[]'"
 at_fn_check_prepare_trace "jsonrpc.at:34"
 ( $at_check_trace; ovstest test-jsonrpc notify unix:socket shutdown '[]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63152,7 +63180,7 @@
    sleep 1; if kill -0 $pid; then :; else echo success; exit 0; fi
    sleep 1; if kill -0 $pid; then :; else echo success; exit 0; fi
    echo failure; exit 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -63167,7 +63195,7 @@
 $as_echo "$at_srcdir/jsonrpc.at:47: test ! -e pid"
 at_fn_check_prepare_trace "jsonrpc.at:47"
 ( $at_check_trace; test ! -e pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63180,13 +63208,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_621
-#AT_START_622
-at_fn_group_banner 622 'jsonrpc-py.at:3' \
+#AT_STOP_622
+#AT_START_623
+at_fn_group_banner 623 'jsonrpc-py.at:3' \
   "JSON-RPC request and successful reply - Python" " " 43
 at_xfail=no
 (
-  $as_echo "622. $at_setup_line: testing $at_desc ..."
+  $as_echo "623. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "jsonrpc-py.at:4" >"$at_check_line_file"
@@ -63197,7 +63225,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:6: \$PYTHON \$srcdir/test-jsonrpc.py --detach --pidfile=\`pwd\`/pid listen punix:socket"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc-py.at:6"
 ( $at_check_trace; $PYTHON $srcdir/test-jsonrpc.py --detach --pidfile=`pwd`/pid listen punix:socket
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63210,7 +63238,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:7: test -s pid"
 at_fn_check_prepare_trace "jsonrpc-py.at:7"
 ( $at_check_trace; test -s pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63223,7 +63251,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:8: kill -0 \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc-py.at:8"
 ( $at_check_trace; kill -0 `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63236,7 +63264,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:9: \$PYTHON \$srcdir/test-jsonrpc.py request unix:socket echo '[{\"a\": \"b\", \"x\": null}]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-jsonrpc.py request unix:socket echo '[{\"a\": \"b\", \"x\": null}]'" "jsonrpc-py.at:9"
 ( $at_check_trace; $PYTHON $srcdir/test-jsonrpc.py request unix:socket echo '[{"a": "b", "x": null}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63254,7 +63282,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:13: kill \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc-py.at:13"
 ( $at_check_trace; kill `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63267,13 +63295,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_622
-#AT_START_623
-at_fn_group_banner 623 'jsonrpc-py.at:16' \
+#AT_STOP_623
+#AT_START_624
+at_fn_group_banner 624 'jsonrpc-py.at:16' \
   "JSON-RPC request and error reply - Python" "      " 43
 at_xfail=no
 (
-  $as_echo "623. $at_setup_line: testing $at_desc ..."
+  $as_echo "624. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "jsonrpc-py.at:17" >"$at_check_line_file"
@@ -63284,7 +63312,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:19: \$PYTHON \$srcdir/test-jsonrpc.py --detach --pidfile=\`pwd\`/pid listen punix:socket"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc-py.at:19"
 ( $at_check_trace; $PYTHON $srcdir/test-jsonrpc.py --detach --pidfile=`pwd`/pid listen punix:socket
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63297,7 +63325,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:20: test -s pid"
 at_fn_check_prepare_trace "jsonrpc-py.at:20"
 ( $at_check_trace; test -s pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63310,7 +63338,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:21: kill -0 \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc-py.at:21"
 ( $at_check_trace; kill -0 `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63323,7 +63351,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:22: \$PYTHON \$srcdir/test-jsonrpc.py request unix:socket bad-request '[]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-jsonrpc.py request unix:socket bad-request '[]'" "jsonrpc-py.at:22"
 ( $at_check_trace; $PYTHON $srcdir/test-jsonrpc.py request unix:socket bad-request '[]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63341,7 +63369,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:26: kill \`cat pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc-py.at:26"
 ( $at_check_trace; kill `cat pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63354,13 +63382,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_623
-#AT_START_624
-at_fn_group_banner 624 'jsonrpc-py.at:29' \
+#AT_STOP_624
+#AT_START_625
+at_fn_group_banner 625 'jsonrpc-py.at:29' \
   "JSON-RPC notification - Python" "                 " 43
 at_xfail=no
 (
-  $as_echo "624. $at_setup_line: testing $at_desc ..."
+  $as_echo "625. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "jsonrpc-py.at:30" >"$at_check_line_file"
@@ -63371,7 +63399,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:32: \$PYTHON \$srcdir/test-jsonrpc.py --detach --pidfile=\`pwd\`/pid listen punix:socket"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc-py.at:32"
 ( $at_check_trace; $PYTHON $srcdir/test-jsonrpc.py --detach --pidfile=`pwd`/pid listen punix:socket
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63384,7 +63412,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:33: test -s pid"
 at_fn_check_prepare_trace "jsonrpc-py.at:33"
 ( $at_check_trace; test -s pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63398,7 +63426,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:35: cp pid pid2"
 at_fn_check_prepare_trace "jsonrpc-py.at:35"
 ( $at_check_trace; cp pid pid2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63411,7 +63439,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:36: kill -0 \`cat pid2\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "jsonrpc-py.at:36"
 ( $at_check_trace; kill -0 `cat pid2`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63424,7 +63452,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:37: \$PYTHON \$srcdir/test-jsonrpc.py notify unix:socket shutdown '[]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-jsonrpc.py notify unix:socket shutdown '[]'" "jsonrpc-py.at:37"
 ( $at_check_trace; $PYTHON $srcdir/test-jsonrpc.py notify unix:socket shutdown '[]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63456,7 +63484,7 @@
    sleep 1; if kill -0 $pid; then :; else echo success; exit 0; fi
    sleep 1; if kill -0 $pid; then :; else echo success; exit 0; fi
    echo failure; exit 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -63471,7 +63499,7 @@
 $as_echo "$at_srcdir/jsonrpc-py.at:50: test ! -e pid"
 at_fn_check_prepare_trace "jsonrpc-py.at:50"
 ( $at_check_trace; test ! -e pid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63484,13 +63512,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_624
-#AT_START_625
-at_fn_group_banner 625 'tunnel.at:3' \
+#AT_STOP_625
+#AT_START_626
+at_fn_group_banner 626 'tunnel.at:3' \
   "tunnel - input" "                                 " 44
 at_xfail=no
 (
-  $as_echo "625. $at_setup_line: testing $at_desc ..."
+  $as_echo "626. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -63503,7 +63531,7 @@
 $as_echo "$at_srcdir/tunnel.at:4: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:4"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63517,7 +63545,7 @@
 $as_echo "$at_srcdir/tunnel.at:4: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:4"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -63539,7 +63567,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63554,7 +63582,7 @@
 $as_echo "$at_srcdir/tunnel.at:4: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel.at:4"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63569,7 +63597,7 @@
 $as_echo "$at_srcdir/tunnel.at:4: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel.at:4"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -63601,7 +63629,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63630,7 +63658,7 @@
                     ofport_request=2 \
                     -- add-port br0 p3 -- set Interface p3 type=gre \
                     options:remote_ip=2.2.2.2 ofport_request=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63650,7 +63678,7 @@
 $as_echo "$at_srcdir/tunnel.at:14: ovs-appctl ofproto/tnl-push-pop off"
 at_fn_check_prepare_trace "tunnel.at:14"
 ( $at_check_trace; ovs-appctl ofproto/tnl-push-pop off
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63668,7 +63696,7 @@
 $as_echo "$at_srcdir/tunnel.at:16: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "tunnel.at:16"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63684,7 +63712,7 @@
 $as_echo "$at_srcdir/tunnel.at:18: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:18"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63705,7 +63733,7 @@
 $as_echo "$at_srcdir/tunnel.at:26: ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=1.2.3.4,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:26"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=1.2.3.4,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63720,7 +63748,7 @@
 $as_echo "$at_srcdir/tunnel.at:27: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:27"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63738,7 +63766,7 @@
 $as_echo "$at_srcdir/tunnel.at:32: ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:32"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63753,7 +63781,7 @@
 $as_echo "$at_srcdir/tunnel.at:33: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:33"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63775,7 +63803,7 @@
 ( $at_check_trace; ovs-vsctl set Interface p2 type=gre options:local_ip=2.2.2.3 \
           options:df_default=false options:ttl=1 options:csum=true \
           -- set Interface p3 type=gre64
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63790,7 +63818,7 @@
 $as_echo "$at_srcdir/tunnel.at:41: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:41"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63810,7 +63838,7 @@
 $as_echo "$at_srcdir/tunnel.at:47: ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:47"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63825,7 +63853,7 @@
 $as_echo "$at_srcdir/tunnel.at:48: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:48"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63842,7 +63870,7 @@
 $as_echo "$at_srcdir/tunnel.at:51: ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.3,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:51"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.3,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63857,7 +63885,7 @@
 $as_echo "$at_srcdir/tunnel.at:52: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:52"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63875,7 +63903,7 @@
 $as_echo "$at_srcdir/tunnel.at:57: ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=5.5.5.5,dst=6.6.6.6,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:57"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=5.5.5.5,dst=6.6.6.6,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "Invalid datapath flow
@@ -63894,7 +63922,7 @@
 $as_echo "$at_srcdir/tunnel.at:62: check_logs \"/receive tunnel port not found/d\""
 at_fn_check_prepare_trace "tunnel.at:62"
 ( $at_check_trace; check_logs "/receive tunnel port not found/d"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63909,7 +63937,7 @@
 $as_echo "$at_srcdir/tunnel.at:62: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel.at:62"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63924,7 +63952,7 @@
 $as_echo "$at_srcdir/tunnel.at:62: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel.at:62"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63939,13 +63967,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_625
-#AT_START_626
-at_fn_group_banner 626 'tunnel.at:65' \
+#AT_STOP_626
+#AT_START_627
+at_fn_group_banner 627 'tunnel.at:65' \
   "tunnel - ECN decapsulation" "                     " 44
 at_xfail=no
 (
-  $as_echo "626. $at_setup_line: testing $at_desc ..."
+  $as_echo "627. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -63958,7 +63986,7 @@
 $as_echo "$at_srcdir/tunnel.at:66: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:66"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -63972,7 +64000,7 @@
 $as_echo "$at_srcdir/tunnel.at:66: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:66"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -63994,7 +64022,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64009,7 +64037,7 @@
 $as_echo "$at_srcdir/tunnel.at:66: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel.at:66"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64024,7 +64052,7 @@
 $as_echo "$at_srcdir/tunnel.at:66: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel.at:66"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -64056,7 +64084,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64079,7 +64107,7 @@
                     options:remote_ip=1.1.1.1 ofport_request=1 \
                     -- add-port br0 p2 -- set Interface p2 type=dummy \
                     ofport_request=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64100,7 +64128,7 @@
 $as_echo "$at_srcdir/tunnel.at:74: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "tunnel.at:74"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64116,7 +64144,7 @@
 $as_echo "$at_srcdir/tunnel.at:76: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:76"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64136,7 +64164,7 @@
 $as_echo "$at_srcdir/tunnel.at:83: ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,tos=0x3,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=3,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:83"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,tos=0x3,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=3,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64151,7 +64179,7 @@
 $as_echo "$at_srcdir/tunnel.at:84: tail -2 stdout"
 at_fn_check_prepare_trace "tunnel.at:84"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64170,7 +64198,7 @@
 $as_echo "$at_srcdir/tunnel.at:90: ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,tos=0x3,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=1,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:90"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,tos=0x3,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=1,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64185,7 +64213,7 @@
 $as_echo "$at_srcdir/tunnel.at:91: tail -2 stdout"
 at_fn_check_prepare_trace "tunnel.at:91"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64204,7 +64232,7 @@
 $as_echo "$at_srcdir/tunnel.at:97: ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,tos=0x3,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=2,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:97"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,tos=0x3,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=2,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64219,7 +64247,7 @@
 $as_echo "$at_srcdir/tunnel.at:98: tail -2 stdout"
 at_fn_check_prepare_trace "tunnel.at:98"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64238,7 +64266,7 @@
 $as_echo "$at_srcdir/tunnel.at:104: ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,tos=0x3,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:104"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,tos=0x3,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64253,7 +64281,7 @@
 $as_echo "$at_srcdir/tunnel.at:105: tail -2 stdout"
 at_fn_check_prepare_trace "tunnel.at:105"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64271,7 +64299,7 @@
 $as_echo "$at_srcdir/tunnel.at:109: check_logs \"/dropping tunnel packet marked ECN CE but is not ECN capable/d\""
 at_fn_check_prepare_trace "tunnel.at:109"
 ( $at_check_trace; check_logs "/dropping tunnel packet marked ECN CE but is not ECN capable/d"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64286,7 +64314,7 @@
 $as_echo "$at_srcdir/tunnel.at:109: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel.at:109"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64301,7 +64329,7 @@
 $as_echo "$at_srcdir/tunnel.at:109: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel.at:109"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64316,13 +64344,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_626
-#AT_START_627
-at_fn_group_banner 627 'tunnel.at:112' \
+#AT_STOP_627
+#AT_START_628
+at_fn_group_banner 628 'tunnel.at:112' \
   "tunnel - output" "                                " 44
 at_xfail=no
 (
-  $as_echo "627. $at_setup_line: testing $at_desc ..."
+  $as_echo "628. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -64335,7 +64363,7 @@
 $as_echo "$at_srcdir/tunnel.at:113: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:113"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64349,7 +64377,7 @@
 $as_echo "$at_srcdir/tunnel.at:113: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:113"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -64371,7 +64399,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64386,7 +64414,7 @@
 $as_echo "$at_srcdir/tunnel.at:113: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel.at:113"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64401,7 +64429,7 @@
 $as_echo "$at_srcdir/tunnel.at:113: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel.at:113"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -64433,7 +64461,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64458,7 +64486,7 @@
                     options:key=5 ofport_request=1\
                     -- add-port br0 p2 -- set Interface p2 type=dummy \
                     ofport_request=2 ofport_request=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64479,7 +64507,7 @@
 $as_echo "$at_srcdir/tunnel.at:122: ovs-appctl ofproto/tnl-push-pop off"
 at_fn_check_prepare_trace "tunnel.at:122"
 ( $at_check_trace; ovs-appctl ofproto/tnl-push-pop off
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64496,7 +64524,7 @@
 $as_echo "$at_srcdir/tunnel.at:123: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "tunnel.at:123"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64512,7 +64540,7 @@
 $as_echo "$at_srcdir/tunnel.at:125: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:125"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64532,7 +64560,7 @@
 $as_echo "$at_srcdir/tunnel.at:132: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:132"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64547,7 +64575,7 @@
 $as_echo "$at_srcdir/tunnel.at:133: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:133"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64565,7 +64593,7 @@
 $as_echo "$at_srcdir/tunnel.at:138: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=1,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:138"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=1,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64580,7 +64608,7 @@
 $as_echo "$at_srcdir/tunnel.at:139: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:139"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64597,7 +64625,7 @@
 $as_echo "$at_srcdir/tunnel.at:142: check_logs "
 at_fn_check_prepare_trace "tunnel.at:142"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64612,7 +64640,7 @@
 $as_echo "$at_srcdir/tunnel.at:142: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel.at:142"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64627,7 +64655,7 @@
 $as_echo "$at_srcdir/tunnel.at:142: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel.at:142"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64642,13 +64670,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_627
-#AT_START_628
-at_fn_group_banner 628 'tunnel.at:145' \
+#AT_STOP_628
+#AT_START_629
+at_fn_group_banner 629 'tunnel.at:145' \
   "tunnel - ToS and TTL inheritance" "               " 44
 at_xfail=no
 (
-  $as_echo "628. $at_setup_line: testing $at_desc ..."
+  $as_echo "629. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -64661,7 +64689,7 @@
 $as_echo "$at_srcdir/tunnel.at:146: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:146"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64675,7 +64703,7 @@
 $as_echo "$at_srcdir/tunnel.at:146: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:146"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -64697,7 +64725,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64712,7 +64740,7 @@
 $as_echo "$at_srcdir/tunnel.at:146: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel.at:146"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64727,7 +64755,7 @@
 $as_echo "$at_srcdir/tunnel.at:146: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel.at:146"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -64759,7 +64787,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64784,7 +64812,7 @@
                     options:ttl=inherit ofport_request=1 \
                     -- add-port br0 p2 -- set Interface p2 type=dummy \
                     ofport_request=2 ofport_request=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64805,7 +64833,7 @@
 $as_echo "$at_srcdir/tunnel.at:155: ovs-appctl ofproto/tnl-push-pop off"
 at_fn_check_prepare_trace "tunnel.at:155"
 ( $at_check_trace; ovs-appctl ofproto/tnl-push-pop off
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64822,7 +64850,7 @@
 $as_echo "$at_srcdir/tunnel.at:156: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "tunnel.at:156"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64838,7 +64866,7 @@
 $as_echo "$at_srcdir/tunnel.at:158: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:158"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64858,7 +64886,7 @@
 $as_echo "$at_srcdir/tunnel.at:165: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:165"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64873,7 +64901,7 @@
 $as_echo "$at_srcdir/tunnel.at:166: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:166"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64891,7 +64919,7 @@
 $as_echo "$at_srcdir/tunnel.at:171: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=5,ttl=128,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:171"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=5,ttl=128,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64906,7 +64934,7 @@
 $as_echo "$at_srcdir/tunnel.at:172: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:172"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64924,7 +64952,7 @@
 $as_echo "$at_srcdir/tunnel.at:177: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0806),arp(sip=1.2.3.4,tip=5.6.7.8,op=1,sha=00:0f:10:11:12:13,tha=00:14:15:16:17:18)'"
 at_fn_check_prepare_trace "tunnel.at:177"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0806),arp(sip=1.2.3.4,tip=5.6.7.8,op=1,sha=00:0f:10:11:12:13,tha=00:14:15:16:17:18)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64939,7 +64967,7 @@
 $as_echo "$at_srcdir/tunnel.at:178: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:178"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64956,7 +64984,7 @@
 $as_echo "$at_srcdir/tunnel.at:181: check_logs "
 at_fn_check_prepare_trace "tunnel.at:181"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64971,7 +64999,7 @@
 $as_echo "$at_srcdir/tunnel.at:181: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel.at:181"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -64986,7 +65014,7 @@
 $as_echo "$at_srcdir/tunnel.at:181: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel.at:181"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65001,13 +65029,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_628
-#AT_START_629
-at_fn_group_banner 629 'tunnel.at:184' \
+#AT_STOP_629
+#AT_START_630
+at_fn_group_banner 630 'tunnel.at:184' \
   "tunnel - set_tunnel" "                            " 44
 at_xfail=no
 (
-  $as_echo "629. $at_setup_line: testing $at_desc ..."
+  $as_echo "630. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -65020,7 +65048,7 @@
 $as_echo "$at_srcdir/tunnel.at:185: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:185"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65034,7 +65062,7 @@
 $as_echo "$at_srcdir/tunnel.at:185: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:185"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -65056,7 +65084,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65071,7 +65099,7 @@
 $as_echo "$at_srcdir/tunnel.at:185: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel.at:185"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65086,7 +65114,7 @@
 $as_echo "$at_srcdir/tunnel.at:185: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel.at:185"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -65118,7 +65146,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65149,7 +65177,7 @@
         options:remote_ip=3.3.3.3 ofport_request=3 \
     -- add-port br0 p4 -- set Interface p4 type=gre options:key=flow \
         options:remote_ip=4.4.4.4 ofport_request=4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65170,7 +65198,7 @@
 $as_echo "$at_srcdir/tunnel.at:198: ovs-appctl ofproto/tnl-push-pop off"
 at_fn_check_prepare_trace "tunnel.at:198"
 ( $at_check_trace; ovs-appctl ofproto/tnl-push-pop off
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65187,7 +65215,7 @@
 $as_echo "$at_srcdir/tunnel.at:199: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "tunnel.at:199"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65203,7 +65231,7 @@
 $as_echo "$at_srcdir/tunnel.at:201: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:201"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65225,7 +65253,7 @@
 $as_echo "$at_srcdir/tunnel.at:209: ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "tunnel.at:209"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65240,7 +65268,7 @@
 $as_echo "$at_srcdir/tunnel.at:210: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:210"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65257,7 +65285,7 @@
 $as_echo "$at_srcdir/tunnel.at:216: check_logs "
 at_fn_check_prepare_trace "tunnel.at:216"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65272,7 +65300,7 @@
 $as_echo "$at_srcdir/tunnel.at:216: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel.at:216"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65287,7 +65315,7 @@
 $as_echo "$at_srcdir/tunnel.at:216: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel.at:216"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65302,13 +65330,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_629
-#AT_START_630
-at_fn_group_banner 630 'tunnel.at:219' \
+#AT_STOP_630
+#AT_START_631
+at_fn_group_banner 631 'tunnel.at:219' \
   "tunnel - key" "                                   " 44
 at_xfail=no
 (
-  $as_echo "630. $at_setup_line: testing $at_desc ..."
+  $as_echo "631. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -65321,7 +65349,7 @@
 $as_echo "$at_srcdir/tunnel.at:220: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:220"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65335,7 +65363,7 @@
 $as_echo "$at_srcdir/tunnel.at:220: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:220"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -65357,7 +65385,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65372,7 +65400,7 @@
 $as_echo "$at_srcdir/tunnel.at:220: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65387,7 +65415,7 @@
 $as_echo "$at_srcdir/tunnel.at:220: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel.at:220"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -65419,7 +65447,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65446,7 +65474,7 @@
         options:out_key=3 options:remote_ip=1.1.1.1 ofport_request=2 \
     -- add-port br0 p3 -- set Interface p3 type=gre options:out_key=5 \
         options:remote_ip=1.1.1.1 ofport_request=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65467,7 +65495,7 @@
 $as_echo "$at_srcdir/tunnel.at:231: ovs-appctl ofproto/tnl-push-pop off"
 at_fn_check_prepare_trace "tunnel.at:231"
 ( $at_check_trace; ovs-appctl ofproto/tnl-push-pop off
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65484,7 +65512,7 @@
 $as_echo "$at_srcdir/tunnel.at:232: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "tunnel.at:232"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65500,7 +65528,7 @@
 $as_echo "$at_srcdir/tunnel.at:234: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:234"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65521,7 +65549,7 @@
 $as_echo "$at_srcdir/tunnel.at:241: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x1,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:241"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x1,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65536,7 +65564,7 @@
 $as_echo "$at_srcdir/tunnel.at:242: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:242"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65554,7 +65582,7 @@
 $as_echo "$at_srcdir/tunnel.at:248: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x2,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:248"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x2,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65569,7 +65597,7 @@
 $as_echo "$at_srcdir/tunnel.at:249: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:249"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65587,7 +65615,7 @@
 $as_echo "$at_srcdir/tunnel.at:255: ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:255"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65602,7 +65630,7 @@
 $as_echo "$at_srcdir/tunnel.at:256: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:256"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65620,7 +65648,7 @@
 $as_echo "$at_srcdir/tunnel.at:262: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0xf,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:262"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0xf,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "Invalid datapath flow
@@ -65638,7 +65666,7 @@
 $as_echo "$at_srcdir/tunnel.at:266: check_logs \"/receive tunnel port not found/d\""
 at_fn_check_prepare_trace "tunnel.at:266"
 ( $at_check_trace; check_logs "/receive tunnel port not found/d"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65653,7 +65681,7 @@
 $as_echo "$at_srcdir/tunnel.at:266: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel.at:266"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65668,7 +65696,7 @@
 $as_echo "$at_srcdir/tunnel.at:266: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel.at:266"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65683,13 +65711,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_630
-#AT_START_631
-at_fn_group_banner 631 'tunnel.at:269' \
+#AT_STOP_631
+#AT_START_632
+at_fn_group_banner 632 'tunnel.at:269' \
   "tunnel - key match" "                             " 44
 at_xfail=no
 (
-  $as_echo "631. $at_setup_line: testing $at_desc ..."
+  $as_echo "632. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -65702,7 +65730,7 @@
 $as_echo "$at_srcdir/tunnel.at:270: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:270"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65716,7 +65744,7 @@
 $as_echo "$at_srcdir/tunnel.at:270: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:270"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -65738,7 +65766,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65753,7 +65781,7 @@
 $as_echo "$at_srcdir/tunnel.at:270: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel.at:270"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65768,7 +65796,7 @@
 $as_echo "$at_srcdir/tunnel.at:270: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel.at:270"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -65800,7 +65828,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65829,7 +65857,7 @@
     -- add-port br0 p3 -- set Interface p3 type=dummy ofport_request=3 \
     -- add-port br0 p4 -- set Interface p4 type=dummy ofport_request=4 \
     -- add-port br0 p5 -- set Interface p5 type=dummy ofport_request=5
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65852,7 +65880,7 @@
 $as_echo "$at_srcdir/tunnel.at:284: ovs-appctl ofproto/tnl-push-pop off"
 at_fn_check_prepare_trace "tunnel.at:284"
 ( $at_check_trace; ovs-appctl ofproto/tnl-push-pop off
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65869,7 +65897,7 @@
 $as_echo "$at_srcdir/tunnel.at:285: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "tunnel.at:285"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65885,7 +65913,7 @@
 $as_echo "$at_srcdir/tunnel.at:287: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:287"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65908,7 +65936,7 @@
 $as_echo "$at_srcdir/tunnel.at:296: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x2,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:296"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x2,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65923,7 +65951,7 @@
 $as_echo "$at_srcdir/tunnel.at:297: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:297"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65941,7 +65969,7 @@
 $as_echo "$at_srcdir/tunnel.at:301: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x3,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:301"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x3,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65956,7 +65984,7 @@
 $as_echo "$at_srcdir/tunnel.at:302: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:302"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65974,7 +66002,7 @@
 $as_echo "$at_srcdir/tunnel.at:306: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x3,src=3.3.3.3,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:306"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x3,src=3.3.3.3,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -65989,7 +66017,7 @@
 $as_echo "$at_srcdir/tunnel.at:307: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:307"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66007,7 +66035,7 @@
 $as_echo "$at_srcdir/tunnel.at:311: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x0,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
 at_fn_check_prepare_trace "tunnel.at:311"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x0,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66022,7 +66050,7 @@
 $as_echo "$at_srcdir/tunnel.at:312: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:312"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66040,7 +66068,7 @@
 $as_echo "$at_srcdir/tunnel.at:316: check_logs "
 at_fn_check_prepare_trace "tunnel.at:316"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66055,7 +66083,7 @@
 $as_echo "$at_srcdir/tunnel.at:316: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel.at:316"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66070,7 +66098,7 @@
 $as_echo "$at_srcdir/tunnel.at:316: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel.at:316"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66085,13 +66113,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_631
-#AT_START_632
-at_fn_group_banner 632 'tunnel.at:319' \
+#AT_STOP_632
+#AT_START_633
+at_fn_group_banner 633 'tunnel.at:319' \
   "tunnel - Geneve" "                                " 44
 at_xfail=no
 (
-  $as_echo "632. $at_setup_line: testing $at_desc ..."
+  $as_echo "633. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -66104,7 +66132,7 @@
 $as_echo "$at_srcdir/tunnel.at:320: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:320"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66118,7 +66146,7 @@
 $as_echo "$at_srcdir/tunnel.at:320: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:320"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -66140,7 +66168,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66155,7 +66183,7 @@
 $as_echo "$at_srcdir/tunnel.at:320: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel.at:320"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66170,7 +66198,7 @@
 $as_echo "$at_srcdir/tunnel.at:320: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel.at:320"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -66202,7 +66230,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66221,7 +66249,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:320"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=geneve \
                     options:remote_ip=1.1.1.1 ofport_request=1 options:dst_port=5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66238,7 +66266,7 @@
 $as_echo "$at_srcdir/tunnel.at:323: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:323"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66257,7 +66285,7 @@
 $as_echo "$at_srcdir/tunnel.at:328: check_logs "
 at_fn_check_prepare_trace "tunnel.at:328"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66272,7 +66300,7 @@
 $as_echo "$at_srcdir/tunnel.at:328: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel.at:328"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66287,7 +66315,7 @@
 $as_echo "$at_srcdir/tunnel.at:328: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel.at:328"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66302,13 +66330,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_632
-#AT_START_633
-at_fn_group_banner 633 'tunnel.at:331' \
+#AT_STOP_633
+#AT_START_634
+at_fn_group_banner 634 'tunnel.at:331' \
   "tunnel - VXLAN" "                                 " 44
 at_xfail=no
 (
-  $as_echo "633. $at_setup_line: testing $at_desc ..."
+  $as_echo "634. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -66321,7 +66349,7 @@
 $as_echo "$at_srcdir/tunnel.at:332: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:332"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66335,7 +66363,7 @@
 $as_echo "$at_srcdir/tunnel.at:332: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:332"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -66357,7 +66385,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66372,7 +66400,7 @@
 $as_echo "$at_srcdir/tunnel.at:332: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel.at:332"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66387,7 +66415,7 @@
 $as_echo "$at_srcdir/tunnel.at:332: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel.at:332"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -66419,7 +66447,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66438,7 +66466,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:332"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=vxlan \
                     options:remote_ip=1.1.1.1 ofport_request=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66455,7 +66483,7 @@
 $as_echo "$at_srcdir/tunnel.at:335: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:335"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66474,7 +66502,7 @@
 $as_echo "$at_srcdir/tunnel.at:340: check_logs "
 at_fn_check_prepare_trace "tunnel.at:340"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66489,7 +66517,7 @@
 $as_echo "$at_srcdir/tunnel.at:340: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel.at:340"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66504,7 +66532,7 @@
 $as_echo "$at_srcdir/tunnel.at:340: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel.at:340"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66519,13 +66547,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_633
-#AT_START_634
-at_fn_group_banner 634 'tunnel.at:343' \
+#AT_STOP_634
+#AT_START_635
+at_fn_group_banner 635 'tunnel.at:343' \
   "tunnel - LISP" "                                  " 44
 at_xfail=no
 (
-  $as_echo "634. $at_setup_line: testing $at_desc ..."
+  $as_echo "635. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -66538,7 +66566,7 @@
 $as_echo "$at_srcdir/tunnel.at:344: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:344"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66552,7 +66580,7 @@
 $as_echo "$at_srcdir/tunnel.at:344: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:344"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -66574,7 +66602,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66589,7 +66617,7 @@
 $as_echo "$at_srcdir/tunnel.at:344: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel.at:344"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66604,7 +66632,7 @@
 $as_echo "$at_srcdir/tunnel.at:344: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel.at:344"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -66636,7 +66664,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66655,7 +66683,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:344"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=lisp \
                     options:remote_ip=1.1.1.1 ofport_request=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66672,7 +66700,7 @@
 $as_echo "$at_srcdir/tunnel.at:347: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:347"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66691,7 +66719,7 @@
 $as_echo "$at_srcdir/tunnel.at:352: check_logs "
 at_fn_check_prepare_trace "tunnel.at:352"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66706,7 +66734,7 @@
 $as_echo "$at_srcdir/tunnel.at:352: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel.at:352"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66721,7 +66749,7 @@
 $as_echo "$at_srcdir/tunnel.at:352: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel.at:352"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66736,13 +66764,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_634
-#AT_START_635
-at_fn_group_banner 635 'tunnel.at:355' \
+#AT_STOP_635
+#AT_START_636
+at_fn_group_banner 636 'tunnel.at:355' \
   "tunnel - different VXLAN UDP port" "              " 44
 at_xfail=no
 (
-  $as_echo "635. $at_setup_line: testing $at_desc ..."
+  $as_echo "636. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -66755,7 +66783,7 @@
 $as_echo "$at_srcdir/tunnel.at:356: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:356"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66769,7 +66797,7 @@
 $as_echo "$at_srcdir/tunnel.at:356: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:356"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -66791,7 +66819,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66806,7 +66834,7 @@
 $as_echo "$at_srcdir/tunnel.at:356: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel.at:356"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66821,7 +66849,7 @@
 $as_echo "$at_srcdir/tunnel.at:356: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel.at:356"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -66853,7 +66881,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66872,7 +66900,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:356"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=vxlan \
                     options:remote_ip=1.1.1.1 ofport_request=1 options:dst_port=4341
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66889,7 +66917,7 @@
 $as_echo "$at_srcdir/tunnel.at:359: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:359"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66909,7 +66937,7 @@
 $as_echo "$at_srcdir/tunnel.at:366: ovs-vsctl -- set Interface p1 options:dst_port=5000"
 at_fn_check_prepare_trace "tunnel.at:366"
 ( $at_check_trace; ovs-vsctl -- set Interface p1 options:dst_port=5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66925,7 +66953,7 @@
 $as_echo "$at_srcdir/tunnel.at:368: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:368"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66945,7 +66973,7 @@
 $as_echo "$at_srcdir/tunnel.at:375: ovs-vsctl -- set Interface p1 options:dst_port=4789"
 at_fn_check_prepare_trace "tunnel.at:375"
 ( $at_check_trace; ovs-vsctl -- set Interface p1 options:dst_port=4789
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66961,7 +66989,7 @@
 $as_echo "$at_srcdir/tunnel.at:377: ovs-appctl dpif/show | tail -n +3"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:377"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66979,7 +67007,7 @@
 $as_echo "$at_srcdir/tunnel.at:381: check_logs "
 at_fn_check_prepare_trace "tunnel.at:381"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -66994,7 +67022,7 @@
 $as_echo "$at_srcdir/tunnel.at:381: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel.at:381"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67009,7 +67037,7 @@
 $as_echo "$at_srcdir/tunnel.at:381: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel.at:381"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67024,13 +67052,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_635
-#AT_START_636
-at_fn_group_banner 636 'tunnel.at:384' \
+#AT_STOP_636
+#AT_START_637
+at_fn_group_banner 637 'tunnel.at:384' \
   "ofproto-dpif - set_field - tun_src/tun_dst/tun_id" "" 44
 at_xfail=no
 (
-  $as_echo "636. $at_setup_line: testing $at_desc ..."
+  $as_echo "637. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -67043,7 +67071,7 @@
 $as_echo "$at_srcdir/tunnel.at:385: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:385"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67057,7 +67085,7 @@
 $as_echo "$at_srcdir/tunnel.at:385: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:385"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -67079,7 +67107,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67094,7 +67122,7 @@
 $as_echo "$at_srcdir/tunnel.at:385: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel.at:385"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67109,7 +67137,7 @@
 $as_echo "$at_srcdir/tunnel.at:385: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel.at:385"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -67141,7 +67169,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67176,7 +67204,7 @@
         options:remote_ip=flow ofport_request=4 \
     -- add-port br0 p5 -- set Interface p5 type=gre options:key=flow \
         options:remote_ip=5.5.5.5 ofport_request=5
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67193,7 +67221,7 @@
 $as_echo "$at_srcdir/tunnel.at:397: ovs-appctl ofproto/tnl-push-pop off"
 at_fn_check_prepare_trace "tunnel.at:397"
 ( $at_check_trace; ovs-appctl ofproto/tnl-push-pop off
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67221,7 +67249,7 @@
 $as_echo "$at_srcdir/tunnel.at:407: ovs-ofctl add-flows br0 flows.txt"
 at_fn_check_prepare_trace "tunnel.at:407"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67236,7 +67264,7 @@
 $as_echo "$at_srcdir/tunnel.at:408: ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "tunnel.at:408"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67251,7 +67279,7 @@
 $as_echo "$at_srcdir/tunnel.at:409: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel.at:409"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67268,7 +67296,7 @@
 $as_echo "$at_srcdir/tunnel.at:412: check_logs "
 at_fn_check_prepare_trace "tunnel.at:412"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67283,7 +67311,7 @@
 $as_echo "$at_srcdir/tunnel.at:412: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel.at:412"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67298,7 +67326,7 @@
 $as_echo "$at_srcdir/tunnel.at:412: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel.at:412"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67313,13 +67341,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_636
-#AT_START_637
-at_fn_group_banner 637 'tunnel-push-pop.at:3' \
+#AT_STOP_637
+#AT_START_638
+at_fn_group_banner 638 'tunnel-push-pop.at:3' \
   "tunnel_push_pop - action" "                       " 45
 at_xfail=no
 (
-  $as_echo "637. $at_setup_line: testing $at_desc ..."
+  $as_echo "638. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -67333,7 +67361,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:5: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel-push-pop.at:5"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67347,7 +67375,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:5: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel-push-pop.at:5"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -67369,7 +67397,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67384,7 +67412,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:5: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "tunnel-push-pop.at:5"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67399,7 +67427,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:5: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "tunnel-push-pop.at:5"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -67431,7 +67459,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67448,7 +67476,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:5: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 "
 at_fn_check_prepare_trace "tunnel-push-pop.at:5"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67464,7 +67492,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:6: ovs-vsctl add-br int-br -- set bridge int-br datapath_type=dummy"
 at_fn_check_prepare_trace "tunnel-push-pop.at:6"
 ( $at_check_trace; ovs-vsctl add-br int-br -- set bridge int-br datapath_type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67495,7 +67523,7 @@
                     -- add-port int-br t4 -- set Interface t4 type=geneve \
                        options:remote_ip=flow options:key=123 ofport_request=5\
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67511,7 +67539,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:17: ovs-appctl dpif/show"
 at_fn_check_prepare_trace "tunnel-push-pop.at:17"
 ( $at_check_trace; ovs-appctl dpif/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67538,7 +67566,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:30: ovs-appctl ovs/route/add 1.1.2.92/24 br0"
 at_fn_check_prepare_trace "tunnel-push-pop.at:30"
 ( $at_check_trace; ovs-appctl ovs/route/add 1.1.2.92/24 br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67555,7 +67583,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:32: ovs-appctl netdev-dummy/ip4addr br0 1.1.2.88/24"
 at_fn_check_prepare_trace "tunnel-push-pop.at:32"
 ( $at_check_trace; ovs-appctl netdev-dummy/ip4addr br0 1.1.2.88/24
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67573,7 +67601,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:35: ovs-ofctl add-flow br0 action=normal"
 at_fn_check_prepare_trace "tunnel-push-pop.at:35"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67589,7 +67617,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:38: ovs-appctl netdev-dummy/receive br0 'recirc_id(0),in_port(100),eth(src=f8:bc:12:44:34:b6,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=1.1.2.92,tip=1.1.2.88,op=1,sha=f8:bc:12:44:34:b6,tha=00:00:00:00:00:00)'"
 at_fn_check_prepare_trace "tunnel-push-pop.at:38"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive br0 'recirc_id(0),in_port(100),eth(src=f8:bc:12:44:34:b6,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=1.1.2.92,tip=1.1.2.88,op=1,sha=f8:bc:12:44:34:b6,tha=00:00:00:00:00:00)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67604,7 +67632,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:39: ovs-appctl netdev-dummy/receive br0 'recirc_id(0),in_port(100),eth(src=f8:bc:12:44:34:b7,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=1.1.2.93,tip=1.1.2.88,op=1,sha=f8:bc:12:44:34:b7,tha=00:00:00:00:00:00)'"
 at_fn_check_prepare_trace "tunnel-push-pop.at:39"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive br0 'recirc_id(0),in_port(100),eth(src=f8:bc:12:44:34:b7,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=1.1.2.93,tip=1.1.2.88,op=1,sha=f8:bc:12:44:34:b7,tha=00:00:00:00:00:00)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67620,7 +67648,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:41: ovs-appctl tnl/arp/show"
 at_fn_check_prepare_trace "tunnel-push-pop.at:41"
 ( $at_check_trace; ovs-appctl tnl/arp/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67641,7 +67669,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:48: ovs-appctl tnl/ports/show |sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel-push-pop.at:48"
 ( $at_check_trace; ovs-appctl tnl/ports/show |sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67662,7 +67690,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:56: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=17,tos=0,ttl=64,frag=no),udp(src=51283,dst=4789)'"
 at_fn_check_prepare_trace "tunnel-push-pop.at:56"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=17,tos=0,ttl=64,frag=no),udp(src=51283,dst=4789)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67677,7 +67705,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:57: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel-push-pop.at:57"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67695,7 +67723,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:62: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=47,tos=0,ttl=64,frag=no)'"
 at_fn_check_prepare_trace "tunnel-push-pop.at:62"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=47,tos=0,ttl=64,frag=no)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67710,7 +67738,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:63: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel-push-pop.at:63"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67728,7 +67756,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:68: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=17,tos=0,ttl=64,frag=no),udp(src=51283,dst=6081)'"
 at_fn_check_prepare_trace "tunnel-push-pop.at:68"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=17,tos=0,ttl=64,frag=no),udp(src=51283,dst=6081)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67743,7 +67771,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:69: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel-push-pop.at:69"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67761,7 +67789,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:74: ovs-ofctl add-flow int-br action=2"
 at_fn_check_prepare_trace "tunnel-push-pop.at:74"
 ( $at_check_trace; ovs-ofctl add-flow int-br action=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67776,7 +67804,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:75: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'"
 at_fn_check_prepare_trace "tunnel-push-pop.at:75"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67791,11 +67819,11 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:76: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel-push-pop.at:76"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "Datapath actions: tnl_push(tnl_port(4789),header(size=50,type=4,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=4789,csum=0x0),vxlan(flags=0x8000000,vni=0x7b)),out_port(100))
+echo >>"$at_stdout"; $as_echo "Datapath actions: tnl_push(tnl_port(4789),header(size=50,type=4,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=4789,csum=0x0),vxlan(flags=0x8000000,vni=0x7b)),out_port(100))
 " | \
   $at_diff - "$at_stdout" || at_failed=:
 at_fn_check_status 0 $at_status "$at_srcdir/tunnel-push-pop.at:76"
@@ -67809,7 +67837,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:81: ovs-ofctl add-flow int-br \"actions=set_tunnel:124,4\""
 at_fn_check_prepare_trace "tunnel-push-pop.at:81"
 ( $at_check_trace; ovs-ofctl add-flow int-br "actions=set_tunnel:124,4"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67824,7 +67852,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:82: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'"
 at_fn_check_prepare_trace "tunnel-push-pop.at:82"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67839,11 +67867,11 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:83: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel-push-pop.at:83"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "Datapath actions: tnl_push(tnl_port(4789),header(size=50,type=4,eth(dst=f8:bc:12:44:34:b7,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.93,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=4789,csum=0xffff),vxlan(flags=0x8000000,vni=0x7c)),out_port(100))
+echo >>"$at_stdout"; $as_echo "Datapath actions: tnl_push(tnl_port(4789),header(size=50,type=4,eth(dst=f8:bc:12:44:34:b7,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.93,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=4789,csum=0xffff),vxlan(flags=0x8000000,vni=0x7c)),out_port(100))
 " | \
   $at_diff - "$at_stdout" || at_failed=:
 at_fn_check_status 0 $at_status "$at_srcdir/tunnel-push-pop.at:83"
@@ -67857,7 +67885,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:88: ovs-ofctl add-flow int-br action=3"
 at_fn_check_prepare_trace "tunnel-push-pop.at:88"
 ( $at_check_trace; ovs-ofctl add-flow int-br action=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67872,7 +67900,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:89: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'"
 at_fn_check_prepare_trace "tunnel-push-pop.at:89"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67887,11 +67915,11 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:90: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel-push-pop.at:90"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "Datapath actions: tnl_push(tnl_port(3),header(size=42,type=3,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=47,tos=0,ttl=64,frag=0x40),gre((flags=0x2000,proto=0x6558),key=0x1c8)),out_port(100))
+echo >>"$at_stdout"; $as_echo "Datapath actions: tnl_push(tnl_port(3),header(size=42,type=3,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=47,tos=0,ttl=64,frag=0x4000),gre((flags=0x2000,proto=0x6558),key=0x1c8)),out_port(100))
 " | \
   $at_diff - "$at_stdout" || at_failed=:
 at_fn_check_status 0 $at_status "$at_srcdir/tunnel-push-pop.at:90"
@@ -67905,7 +67933,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:95: ovs-ofctl add-flow int-br \"actions=set_field:1.1.2.92->tun_dst,5\""
 at_fn_check_prepare_trace "tunnel-push-pop.at:95"
 ( $at_check_trace; ovs-ofctl add-flow int-br "actions=set_field:1.1.2.92->tun_dst,5"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67920,7 +67948,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:96: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'"
 at_fn_check_prepare_trace "tunnel-push-pop.at:96"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67935,11 +67963,11 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:97: tail -1 stdout"
 at_fn_check_prepare_trace "tunnel-push-pop.at:97"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "Datapath actions: tnl_push(tnl_port(6081),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=6081,csum=0x0),geneve(vni=0x7b)),out_port(100))
+echo >>"$at_stdout"; $as_echo "Datapath actions: tnl_push(tnl_port(6081),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=6081,csum=0x0),geneve(vni=0x7b)),out_port(100))
 " | \
   $at_diff - "$at_stdout" || at_failed=:
 at_fn_check_status 0 $at_status "$at_srcdir/tunnel-push-pop.at:97"
@@ -67953,7 +67981,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:102: ovs-appctl netdev-dummy/receive p0 '001b213cac30001b213cab6408004500007e79464000402f99080101025c0101025820006558000001c8fe71d883724fbeb6f4e1494a080045000054ba200000400184861e0000011e00000200004227e75400030af3195500000000f265010000000000101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f3031323334353637'"
 at_fn_check_prepare_trace "tunnel-push-pop.at:102"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p0 '001b213cac30001b213cab6408004500007e79464000402f99080101025c0101025820006558000001c8fe71d883724fbeb6f4e1494a080045000054ba200000400184861e0000011e00000200004227e75400030af3195500000000f265010000000000101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f3031323334353637'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67970,7 +67998,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:105: ovs-ofctl dump-ports int-br | grep 'port  3'"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel-push-pop.at:105"
 ( $at_check_trace; ovs-ofctl dump-ports int-br | grep 'port  3'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -67988,7 +68016,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:110: ovs-appctl netdev-dummy/receive p0 '001b213cac30001b213cab6408004500007e79464000402f99080101025c0101025820000800000001c8fe71d883724fbeb6f4e1494a080045000054ba200000400184861e0000011e00000200004227e75400030af3195500000000f265010000000000101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f3031323334353637'"
 at_fn_check_prepare_trace "tunnel-push-pop.at:110"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p0 '001b213cac30001b213cab6408004500007e79464000402f99080101025c0101025820000800000001c8fe71d883724fbeb6f4e1494a080045000054ba200000400184861e0000011e00000200004227e75400030af3195500000000f265010000000000101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f3031323334353637'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68005,7 +68033,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:113: ovs-ofctl dump-ports int-br | grep 'port  3'"
 at_fn_check_prepare_notrace 'a shell pipeline' "tunnel-push-pop.at:113"
 ( $at_check_trace; ovs-ofctl dump-ports int-br | grep 'port  3'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68023,7 +68051,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:117: check_logs "
 at_fn_check_prepare_trace "tunnel-push-pop.at:117"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68038,7 +68066,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:117: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "tunnel-push-pop.at:117"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68053,7 +68081,7 @@
 $as_echo "$at_srcdir/tunnel-push-pop.at:117: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "tunnel-push-pop.at:117"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68068,13 +68096,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_637
-#AT_START_638
-at_fn_group_banner 638 'lockfile.at:15' \
+#AT_STOP_638
+#AT_START_639
+at_fn_group_banner 639 'lockfile.at:15' \
   "lock and unlock" "                                " 46
 at_xfail=no
 (
-  $as_echo "638. $at_setup_line: testing $at_desc ..."
+  $as_echo "639. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -68083,7 +68111,7 @@
 $as_echo "$at_srcdir/lockfile.at:15: ovstest test-lockfile lock_and_unlock"
 at_fn_check_prepare_trace "lockfile.at:15"
 ( $at_check_trace; ovstest test-lockfile lock_and_unlock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -68098,7 +68126,7 @@
 $as_echo "$at_srcdir/lockfile.at:15: sed 's/pid [0-9]*/pid /' stderr"
 at_fn_check_prepare_trace "lockfile.at:15"
 ( $at_check_trace; sed 's/pid [0-9]*/pid /' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68111,13 +68139,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_638
-#AT_START_639
-at_fn_group_banner 639 'lockfile.at:17' \
+#AT_STOP_639
+#AT_START_640
+at_fn_group_banner 640 'lockfile.at:17' \
   "lock and unlock twice" "                          " 46
 at_xfail=no
 (
-  $as_echo "639. $at_setup_line: testing $at_desc ..."
+  $as_echo "640. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -68126,7 +68154,7 @@
 $as_echo "$at_srcdir/lockfile.at:17: ovstest test-lockfile lock_and_unlock_twice"
 at_fn_check_prepare_trace "lockfile.at:17"
 ( $at_check_trace; ovstest test-lockfile lock_and_unlock_twice
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -68141,7 +68169,7 @@
 $as_echo "$at_srcdir/lockfile.at:17: sed 's/pid [0-9]*/pid /' stderr"
 at_fn_check_prepare_trace "lockfile.at:17"
 ( $at_check_trace; sed 's/pid [0-9]*/pid /' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68154,13 +68182,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_639
-#AT_START_640
-at_fn_group_banner 640 'lockfile.at:19' \
+#AT_STOP_640
+#AT_START_641
+at_fn_group_banner 641 'lockfile.at:19' \
   "lock blocks same process" "                       " 46
 at_xfail=no
 (
-  $as_echo "640. $at_setup_line: testing $at_desc ..."
+  $as_echo "641. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -68169,7 +68197,7 @@
 $as_echo "$at_srcdir/lockfile.at:19: ovstest test-lockfile lock_blocks_same_process"
 at_fn_check_prepare_trace "lockfile.at:19"
 ( $at_check_trace; ovstest test-lockfile lock_blocks_same_process
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -68184,7 +68212,7 @@
 $as_echo "$at_srcdir/lockfile.at:19: sed 's/pid [0-9]*/pid /' stderr"
 at_fn_check_prepare_trace "lockfile.at:19"
 ( $at_check_trace; sed 's/pid [0-9]*/pid /' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68199,13 +68227,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_640
-#AT_START_641
-at_fn_group_banner 641 'lockfile.at:23' \
+#AT_STOP_641
+#AT_START_642
+at_fn_group_banner 642 'lockfile.at:23' \
   "lock blocks same process twice" "                 " 46
 at_xfail=no
 (
-  $as_echo "641. $at_setup_line: testing $at_desc ..."
+  $as_echo "642. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -68214,7 +68242,7 @@
 $as_echo "$at_srcdir/lockfile.at:23: ovstest test-lockfile lock_blocks_same_process_twice"
 at_fn_check_prepare_trace "lockfile.at:23"
 ( $at_check_trace; ovstest test-lockfile lock_blocks_same_process_twice
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -68229,7 +68257,7 @@
 $as_echo "$at_srcdir/lockfile.at:23: sed 's/pid [0-9]*/pid /' stderr"
 at_fn_check_prepare_trace "lockfile.at:23"
 ( $at_check_trace; sed 's/pid [0-9]*/pid /' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68245,13 +68273,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_641
-#AT_START_642
-at_fn_group_banner 642 'lockfile.at:28' \
+#AT_STOP_642
+#AT_START_643
+at_fn_group_banner 643 'lockfile.at:28' \
   "lock blocks other process" "                      " 46
 at_xfail=no
 (
-  $as_echo "642. $at_setup_line: testing $at_desc ..."
+  $as_echo "643. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "lockfile.at:28" >"$at_check_line_file"
@@ -68262,7 +68290,7 @@
 $as_echo "$at_srcdir/lockfile.at:28: ovstest test-lockfile lock_blocks_other_process"
 at_fn_check_prepare_trace "lockfile.at:28"
 ( $at_check_trace; ovstest test-lockfile lock_blocks_other_process
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -68277,7 +68305,7 @@
 $as_echo "$at_srcdir/lockfile.at:28: sed 's/pid [0-9]*/pid /' stderr"
 at_fn_check_prepare_trace "lockfile.at:28"
 ( $at_check_trace; sed 's/pid [0-9]*/pid /' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68293,13 +68321,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_642
-#AT_START_643
-at_fn_group_banner 643 'lockfile.at:33' \
+#AT_STOP_643
+#AT_START_644
+at_fn_group_banner 644 'lockfile.at:33' \
   "lock twice blocks other process" "                " 46
 at_xfail=no
 (
-  $as_echo "643. $at_setup_line: testing $at_desc ..."
+  $as_echo "644. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "lockfile.at:33" >"$at_check_line_file"
@@ -68310,7 +68338,7 @@
 $as_echo "$at_srcdir/lockfile.at:33: ovstest test-lockfile lock_twice_blocks_other_process"
 at_fn_check_prepare_trace "lockfile.at:33"
 ( $at_check_trace; ovstest test-lockfile lock_twice_blocks_other_process
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -68325,7 +68353,7 @@
 $as_echo "$at_srcdir/lockfile.at:33: sed 's/pid [0-9]*/pid /' stderr"
 at_fn_check_prepare_trace "lockfile.at:33"
 ( $at_check_trace; sed 's/pid [0-9]*/pid /' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68342,13 +68370,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_643
-#AT_START_644
-at_fn_group_banner 644 'lockfile.at:39' \
+#AT_STOP_644
+#AT_START_645
+at_fn_group_banner 645 'lockfile.at:39' \
   "lock and unlock allows other process" "           " 46
 at_xfail=no
 (
-  $as_echo "644. $at_setup_line: testing $at_desc ..."
+  $as_echo "645. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "lockfile.at:39" >"$at_check_line_file"
@@ -68359,7 +68387,7 @@
 $as_echo "$at_srcdir/lockfile.at:39: ovstest test-lockfile lock_and_unlock_allows_other_process"
 at_fn_check_prepare_trace "lockfile.at:39"
 ( $at_check_trace; ovstest test-lockfile lock_and_unlock_allows_other_process
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -68374,7 +68402,7 @@
 $as_echo "$at_srcdir/lockfile.at:39: sed 's/pid [0-9]*/pid /' stderr"
 at_fn_check_prepare_trace "lockfile.at:39"
 ( $at_check_trace; sed 's/pid [0-9]*/pid /' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68387,13 +68415,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_644
-#AT_START_645
-at_fn_group_banner 645 'lockfile.at:41' \
+#AT_STOP_645
+#AT_START_646
+at_fn_group_banner 646 'lockfile.at:41' \
   "lock multiple" "                                  " 46
 at_xfail=no
 (
-  $as_echo "645. $at_setup_line: testing $at_desc ..."
+  $as_echo "646. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -68402,7 +68430,7 @@
 $as_echo "$at_srcdir/lockfile.at:41: ovstest test-lockfile lock_multiple"
 at_fn_check_prepare_trace "lockfile.at:41"
 ( $at_check_trace; ovstest test-lockfile lock_multiple
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -68417,7 +68445,7 @@
 $as_echo "$at_srcdir/lockfile.at:41: sed 's/pid [0-9]*/pid /' stderr"
 at_fn_check_prepare_trace "lockfile.at:41"
 ( $at_check_trace; sed 's/pid [0-9]*/pid /' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68432,13 +68460,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_645
-#AT_START_646
-at_fn_group_banner 646 'lockfile.at:45' \
+#AT_STOP_646
+#AT_START_647
+at_fn_group_banner 647 'lockfile.at:45' \
   "lock symlink" "                                   " 46
 at_xfail=no
 (
-  $as_echo "646. $at_setup_line: testing $at_desc ..."
+  $as_echo "647. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "lockfile.at:45" >"$at_check_line_file"
@@ -68449,7 +68477,7 @@
 $as_echo "$at_srcdir/lockfile.at:45: ovstest test-lockfile lock_symlink"
 at_fn_check_prepare_trace "lockfile.at:45"
 ( $at_check_trace; ovstest test-lockfile lock_symlink
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -68464,7 +68492,7 @@
 $as_echo "$at_srcdir/lockfile.at:45: sed 's/pid [0-9]*/pid /' stderr"
 at_fn_check_prepare_trace "lockfile.at:45"
 ( $at_check_trace; sed 's/pid [0-9]*/pid /' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68482,13 +68510,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_646
-#AT_START_647
-at_fn_group_banner 647 'lockfile.at:52' \
+#AT_STOP_647
+#AT_START_648
+at_fn_group_banner 648 'lockfile.at:52' \
   "lock symlink to dir" "                            " 46
 at_xfail=no
 (
-  $as_echo "647. $at_setup_line: testing $at_desc ..."
+  $as_echo "648. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "lockfile.at:52" >"$at_check_line_file"
@@ -68499,7 +68527,7 @@
 $as_echo "$at_srcdir/lockfile.at:52: ovstest test-lockfile lock_symlink_to_dir"
 at_fn_check_prepare_trace "lockfile.at:52"
 ( $at_check_trace; ovstest test-lockfile lock_symlink_to_dir
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -68514,7 +68542,7 @@
 $as_echo "$at_srcdir/lockfile.at:52: sed 's/pid [0-9]*/pid /' stderr"
 at_fn_check_prepare_trace "lockfile.at:52"
 ( $at_check_trace; sed 's/pid [0-9]*/pid /' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68529,13 +68557,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_647
-#AT_START_648
-at_fn_group_banner 648 'reconnect.at:26' \
+#AT_STOP_648
+#AT_START_649
+at_fn_group_banner 649 'reconnect.at:26' \
   "nothing happens if not enabled - C" "             " 47
 at_xfail=no
 (
-  $as_echo "648. $at_setup_line: testing $at_desc ..."
+  $as_echo "649. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -68549,7 +68577,7 @@
 $as_echo "$at_srcdir/reconnect.at:26: ovstest test-reconnect < input"
 at_fn_check_prepare_trace "reconnect.at:26"
 ( $at_check_trace; ovstest test-reconnect < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68567,13 +68595,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_648
-#AT_START_649
-at_fn_group_banner 649 'reconnect.at:26' \
+#AT_STOP_649
+#AT_START_650
+at_fn_group_banner 650 'reconnect.at:26' \
   "nothing happens if not enabled - Python" "        " 47
 at_xfail=no
 (
-  $as_echo "649. $at_setup_line: testing $at_desc ..."
+  $as_echo "650. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "reconnect.at:26" >"$at_check_line_file"
@@ -68589,7 +68617,7 @@
 $as_echo "$at_srcdir/reconnect.at:26: \$PYTHON \$srcdir/test-reconnect.py < input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-reconnect.py < input" "reconnect.at:26"
 ( $at_check_trace; $PYTHON $srcdir/test-reconnect.py < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68607,13 +68635,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_649
-#AT_START_650
-at_fn_group_banner 650 'reconnect.at:37' \
+#AT_STOP_650
+#AT_START_651
+at_fn_group_banner 651 'reconnect.at:37' \
   "quick connect, idle disconnect - C" "             " 47
 at_xfail=no
 (
-  $as_echo "650. $at_setup_line: testing $at_desc ..."
+  $as_echo "651. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -68639,7 +68667,7 @@
 $as_echo "$at_srcdir/reconnect.at:37: ovstest test-reconnect < input"
 at_fn_check_prepare_trace "reconnect.at:37"
 ( $at_check_trace; ovstest test-reconnect < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68690,13 +68718,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_650
-#AT_START_651
-at_fn_group_banner 651 'reconnect.at:37' \
+#AT_STOP_651
+#AT_START_652
+at_fn_group_banner 652 'reconnect.at:37' \
   "quick connect, idle disconnect - Python" "        " 47
 at_xfail=no
 (
-  $as_echo "651. $at_setup_line: testing $at_desc ..."
+  $as_echo "652. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "reconnect.at:37" >"$at_check_line_file"
@@ -68724,7 +68752,7 @@
 $as_echo "$at_srcdir/reconnect.at:37: \$PYTHON \$srcdir/test-reconnect.py < input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-reconnect.py < input" "reconnect.at:37"
 ( $at_check_trace; $PYTHON $srcdir/test-reconnect.py < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68775,13 +68803,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_651
-#AT_START_652
-at_fn_group_banner 652 'reconnect.at:93' \
+#AT_STOP_652
+#AT_START_653
+at_fn_group_banner 653 'reconnect.at:93' \
   "slow connect, idle disconnect - C" "              " 47
 at_xfail=no
 (
-  $as_echo "652. $at_setup_line: testing $at_desc ..."
+  $as_echo "653. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -68812,7 +68840,7 @@
 $as_echo "$at_srcdir/reconnect.at:93: ovstest test-reconnect < input"
 at_fn_check_prepare_trace "reconnect.at:93"
 ( $at_check_trace; ovstest test-reconnect < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68872,13 +68900,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_652
-#AT_START_653
-at_fn_group_banner 653 'reconnect.at:93' \
+#AT_STOP_653
+#AT_START_654
+at_fn_group_banner 654 'reconnect.at:93' \
   "slow connect, idle disconnect - Python" "         " 47
 at_xfail=no
 (
-  $as_echo "653. $at_setup_line: testing $at_desc ..."
+  $as_echo "654. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "reconnect.at:93" >"$at_check_line_file"
@@ -68911,7 +68939,7 @@
 $as_echo "$at_srcdir/reconnect.at:93: \$PYTHON \$srcdir/test-reconnect.py < input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-reconnect.py < input" "reconnect.at:93"
 ( $at_check_trace; $PYTHON $srcdir/test-reconnect.py < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -68971,13 +68999,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_653
-#AT_START_654
-at_fn_group_banner 654 'reconnect.at:163' \
+#AT_STOP_654
+#AT_START_655
+at_fn_group_banner 655 'reconnect.at:163' \
   "connect backs off - C" "                          " 47
 at_xfail=no
 (
-  $as_echo "654. $at_setup_line: testing $at_desc ..."
+  $as_echo "655. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -69048,7 +69076,7 @@
 $as_echo "$at_srcdir/reconnect.at:163: ovstest test-reconnect < input"
 at_fn_check_prepare_trace "reconnect.at:163"
 ( $at_check_trace; ovstest test-reconnect < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -69197,13 +69225,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_654
-#AT_START_655
-at_fn_group_banner 655 'reconnect.at:163' \
+#AT_STOP_655
+#AT_START_656
+at_fn_group_banner 656 'reconnect.at:163' \
   "connect backs off - Python" "                     " 47
 at_xfail=no
 (
-  $as_echo "655. $at_setup_line: testing $at_desc ..."
+  $as_echo "656. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "reconnect.at:163" >"$at_check_line_file"
@@ -69276,7 +69304,7 @@
 $as_echo "$at_srcdir/reconnect.at:163: \$PYTHON \$srcdir/test-reconnect.py < input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-reconnect.py < input" "reconnect.at:163"
 ( $at_check_trace; $PYTHON $srcdir/test-reconnect.py < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -69425,13 +69453,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_655
-#AT_START_656
-at_fn_group_banner 656 'reconnect.at:362' \
+#AT_STOP_656
+#AT_START_657
+at_fn_group_banner 657 'reconnect.at:362' \
   "connections with no data preserve backoff - C" "  " 47
 at_xfail=no
 (
-  $as_echo "656. $at_setup_line: testing $at_desc ..."
+  $as_echo "657. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -69482,7 +69510,7 @@
 $as_echo "$at_srcdir/reconnect.at:362: ovstest test-reconnect < input"
 at_fn_check_prepare_trace "reconnect.at:362"
 ( $at_check_trace; ovstest test-reconnect < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -69617,13 +69645,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_656
-#AT_START_657
-at_fn_group_banner 657 'reconnect.at:362' \
+#AT_STOP_657
+#AT_START_658
+at_fn_group_banner 658 'reconnect.at:362' \
   "connections with no data preserve backoff - Python" "" 47
 at_xfail=no
 (
-  $as_echo "657. $at_setup_line: testing $at_desc ..."
+  $as_echo "658. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "reconnect.at:362" >"$at_check_line_file"
@@ -69676,7 +69704,7 @@
 $as_echo "$at_srcdir/reconnect.at:362: \$PYTHON \$srcdir/test-reconnect.py < input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-reconnect.py < input" "reconnect.at:362"
 ( $at_check_trace; $PYTHON $srcdir/test-reconnect.py < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -69811,13 +69839,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_657
-#AT_START_658
-at_fn_group_banner 658 'reconnect.at:526' \
+#AT_STOP_658
+#AT_START_659
+at_fn_group_banner 659 'reconnect.at:526' \
   "brief connection preserves backoff - C" "         " 47
 at_xfail=no
 (
-  $as_echo "658. $at_setup_line: testing $at_desc ..."
+  $as_echo "659. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -69867,7 +69895,7 @@
 $as_echo "$at_srcdir/reconnect.at:526: ovstest test-reconnect < input"
 at_fn_check_prepare_trace "reconnect.at:526"
 ( $at_check_trace; ovstest test-reconnect < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -69970,13 +69998,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_658
-#AT_START_659
-at_fn_group_banner 659 'reconnect.at:526' \
+#AT_STOP_659
+#AT_START_660
+at_fn_group_banner 660 'reconnect.at:526' \
   "brief connection preserves backoff - Python" "    " 47
 at_xfail=no
 (
-  $as_echo "659. $at_setup_line: testing $at_desc ..."
+  $as_echo "660. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "reconnect.at:526" >"$at_check_line_file"
@@ -70028,7 +70056,7 @@
 $as_echo "$at_srcdir/reconnect.at:526: \$PYTHON \$srcdir/test-reconnect.py < input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-reconnect.py < input" "reconnect.at:526"
 ( $at_check_trace; $PYTHON $srcdir/test-reconnect.py < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -70131,13 +70159,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_659
-#AT_START_660
-at_fn_group_banner 660 'reconnect.at:657' \
+#AT_STOP_660
+#AT_START_661
+at_fn_group_banner 661 'reconnect.at:657' \
   "brief connection with data preserves backoff - C" "" 47
 at_xfail=no
 (
-  $as_echo "660. $at_setup_line: testing $at_desc ..."
+  $as_echo "661. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -70197,7 +70225,7 @@
 $as_echo "$at_srcdir/reconnect.at:657: ovstest test-reconnect < input"
 at_fn_check_prepare_trace "reconnect.at:657"
 ( $at_check_trace; ovstest test-reconnect < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -70319,13 +70347,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_660
-#AT_START_661
-at_fn_group_banner 661 'reconnect.at:657' \
+#AT_STOP_661
+#AT_START_662
+at_fn_group_banner 662 'reconnect.at:657' \
   "brief connection with data preserves backoff - Python" "" 47
 at_xfail=no
 (
-  $as_echo "661. $at_setup_line: testing $at_desc ..."
+  $as_echo "662. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "reconnect.at:657" >"$at_check_line_file"
@@ -70387,7 +70415,7 @@
 $as_echo "$at_srcdir/reconnect.at:657: \$PYTHON \$srcdir/test-reconnect.py < input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-reconnect.py < input" "reconnect.at:657"
 ( $at_check_trace; $PYTHON $srcdir/test-reconnect.py < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -70509,13 +70537,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_661
-#AT_START_662
-at_fn_group_banner 662 'reconnect.at:818' \
+#AT_STOP_662
+#AT_START_663
+at_fn_group_banner 663 'reconnect.at:818' \
   "long connection resets backoff - C" "             " 47
 at_xfail=no
 (
-  $as_echo "662. $at_setup_line: testing $at_desc ..."
+  $as_echo "663. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -70575,7 +70603,7 @@
 $as_echo "$at_srcdir/reconnect.at:818: ovstest test-reconnect < input"
 at_fn_check_prepare_trace "reconnect.at:818"
 ( $at_check_trace; ovstest test-reconnect < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -70697,13 +70725,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_662
-#AT_START_663
-at_fn_group_banner 663 'reconnect.at:818' \
+#AT_STOP_663
+#AT_START_664
+at_fn_group_banner 664 'reconnect.at:818' \
   "long connection resets backoff - Python" "        " 47
 at_xfail=no
 (
-  $as_echo "663. $at_setup_line: testing $at_desc ..."
+  $as_echo "664. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "reconnect.at:818" >"$at_check_line_file"
@@ -70765,7 +70793,7 @@
 $as_echo "$at_srcdir/reconnect.at:818: \$PYTHON \$srcdir/test-reconnect.py < input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-reconnect.py < input" "reconnect.at:818"
 ( $at_check_trace; $PYTHON $srcdir/test-reconnect.py < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -70887,13 +70915,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_663
-#AT_START_664
-at_fn_group_banner 664 'reconnect.at:979' \
+#AT_STOP_664
+#AT_START_665
+at_fn_group_banner 665 'reconnect.at:979' \
   "connection attempt fails quickly - C" "           " 47
 at_xfail=no
 (
-  $as_echo "664. $at_setup_line: testing $at_desc ..."
+  $as_echo "665. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -70922,7 +70950,7 @@
 $as_echo "$at_srcdir/reconnect.at:979: ovstest test-reconnect < input"
 at_fn_check_prepare_trace "reconnect.at:979"
 ( $at_check_trace; ovstest test-reconnect < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -70969,13 +70997,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_664
-#AT_START_665
-at_fn_group_banner 665 'reconnect.at:979' \
+#AT_STOP_665
+#AT_START_666
+at_fn_group_banner 666 'reconnect.at:979' \
   "connection attempt fails quickly - Python" "      " 47
 at_xfail=no
 (
-  $as_echo "665. $at_setup_line: testing $at_desc ..."
+  $as_echo "666. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "reconnect.at:979" >"$at_check_line_file"
@@ -71006,7 +71034,7 @@
 $as_echo "$at_srcdir/reconnect.at:979: \$PYTHON \$srcdir/test-reconnect.py < input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-reconnect.py < input" "reconnect.at:979"
 ( $at_check_trace; $PYTHON $srcdir/test-reconnect.py < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71053,13 +71081,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_665
-#AT_START_666
-at_fn_group_banner 666 'reconnect.at:1034' \
+#AT_STOP_666
+#AT_START_667
+at_fn_group_banner 667 'reconnect.at:1034' \
   "max-tries of 1 honored - C" "                     " 47
 at_xfail=no
 (
-  $as_echo "666. $at_setup_line: testing $at_desc ..."
+  $as_echo "667. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -71086,7 +71114,7 @@
 $as_echo "$at_srcdir/reconnect.at:1034: ovstest test-reconnect < input"
 at_fn_check_prepare_trace "reconnect.at:1034"
 ( $at_check_trace; ovstest test-reconnect < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71140,13 +71168,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_666
-#AT_START_667
-at_fn_group_banner 667 'reconnect.at:1034' \
+#AT_STOP_667
+#AT_START_668
+at_fn_group_banner 668 'reconnect.at:1034' \
   "max-tries of 1 honored - Python" "                " 47
 at_xfail=no
 (
-  $as_echo "667. $at_setup_line: testing $at_desc ..."
+  $as_echo "668. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "reconnect.at:1034" >"$at_check_line_file"
@@ -71175,7 +71203,7 @@
 $as_echo "$at_srcdir/reconnect.at:1034: \$PYTHON \$srcdir/test-reconnect.py < input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-reconnect.py < input" "reconnect.at:1034"
 ( $at_check_trace; $PYTHON $srcdir/test-reconnect.py < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71229,13 +71257,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_667
-#AT_START_668
-at_fn_group_banner 668 'reconnect.at:1094' \
+#AT_STOP_668
+#AT_START_669
+at_fn_group_banner 669 'reconnect.at:1094' \
   "max-tries of 0 honored - C" "                     " 47
 at_xfail=no
 (
-  $as_echo "668. $at_setup_line: testing $at_desc ..."
+  $as_echo "669. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -71251,7 +71279,7 @@
 $as_echo "$at_srcdir/reconnect.at:1094: ovstest test-reconnect < input"
 at_fn_check_prepare_trace "reconnect.at:1094"
 ( $at_check_trace; ovstest test-reconnect < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71272,13 +71300,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_668
-#AT_START_669
-at_fn_group_banner 669 'reconnect.at:1094' \
+#AT_STOP_669
+#AT_START_670
+at_fn_group_banner 670 'reconnect.at:1094' \
   "max-tries of 0 honored - Python" "                " 47
 at_xfail=no
 (
-  $as_echo "669. $at_setup_line: testing $at_desc ..."
+  $as_echo "670. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "reconnect.at:1094" >"$at_check_line_file"
@@ -71296,7 +71324,7 @@
 $as_echo "$at_srcdir/reconnect.at:1094: \$PYTHON \$srcdir/test-reconnect.py < input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-reconnect.py < input" "reconnect.at:1094"
 ( $at_check_trace; $PYTHON $srcdir/test-reconnect.py < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71317,13 +71345,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_669
-#AT_START_670
-at_fn_group_banner 670 'reconnect.at:1110' \
+#AT_STOP_670
+#AT_START_671
+at_fn_group_banner 671 'reconnect.at:1110' \
   "passive mode - C" "                               " 47
 at_xfail=no
 (
-  $as_echo "670. $at_setup_line: testing $at_desc ..."
+  $as_echo "671. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -71370,7 +71398,7 @@
 $as_echo "$at_srcdir/reconnect.at:1110: ovstest test-reconnect < input"
 at_fn_check_prepare_trace "reconnect.at:1110"
 ( $at_check_trace; ovstest test-reconnect < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71460,13 +71488,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_670
-#AT_START_671
-at_fn_group_banner 671 'reconnect.at:1110' \
+#AT_STOP_671
+#AT_START_672
+at_fn_group_banner 672 'reconnect.at:1110' \
   "passive mode - Python" "                          " 47
 at_xfail=no
 (
-  $as_echo "671. $at_setup_line: testing $at_desc ..."
+  $as_echo "672. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "reconnect.at:1110" >"$at_check_line_file"
@@ -71515,7 +71543,7 @@
 $as_echo "$at_srcdir/reconnect.at:1110: \$PYTHON \$srcdir/test-reconnect.py < input"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-reconnect.py < input" "reconnect.at:1110"
 ( $at_check_trace; $PYTHON $srcdir/test-reconnect.py < input
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71605,13 +71633,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_671
-#AT_START_672
-at_fn_group_banner 672 'ovs-vswitchd.at:7' \
+#AT_STOP_672
+#AT_START_673
+at_fn_group_banner 673 'ovs-vswitchd.at:7' \
   "ovs-vswitchd detaches correctly with empty db" "  " 48
 at_xfail=no
 (
-  $as_echo "672. $at_setup_line: testing $at_desc ..."
+  $as_echo "673. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -71629,7 +71657,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:16: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vswitchd.at:16"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71643,7 +71671,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:19: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-vswitchd.at:19"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -71658,7 +71686,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:23: ovs-vswitchd --detach --no-chdir --pidfile --enable-dummy --disable-system --log-file"
 at_fn_check_prepare_trace "ovs-vswitchd.at:23"
 ( $at_check_trace; ovs-vswitchd --detach --no-chdir --pidfile --enable-dummy --disable-system --log-file
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -71674,13 +71702,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_672
-#AT_START_673
-at_fn_group_banner 673 'ovs-vswitchd.at:38' \
+#AT_STOP_673
+#AT_START_674
+at_fn_group_banner 674 'ovs-vswitchd.at:38' \
   "ovs-vswitchd -- stats-update-interval" "          " 48
 at_xfail=no
 (
-  $as_echo "673. $at_setup_line: testing $at_desc ..."
+  $as_echo "674. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -71693,7 +71721,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:39: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vswitchd.at:39"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71707,7 +71735,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:39: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-vswitchd.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -71729,7 +71757,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71744,7 +71772,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:39: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-vswitchd.at:39"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71759,7 +71787,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:39: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-vswitchd.at:39"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -71791,7 +71819,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71808,7 +71836,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:39: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set int p1 type=internal "
 at_fn_check_prepare_trace "ovs-vswitchd.at:39"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set int p1 type=internal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71828,7 +71856,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:44: ovs-vsctl list int p1 | grep statistics | sed -n 's/^.*\\(rx_packets=[0-9][0-9]*\\).*\$/\\1/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vswitchd.at:44"
 ( $at_check_trace; ovs-vsctl list int p1 | grep statistics | sed -n 's/^.*\(rx_packets=[0-9][0-9]*\).*$/\1/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71846,7 +71874,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:45: ovs-appctl netdev-dummy/receive p1 'eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "ovs-vswitchd.at:45"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71863,7 +71891,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:47: ovs-vsctl list int p1 | grep statistics | sed -n 's/^.*\\(rx_packets=[0-9][0-9]*\\).*\$/\\1/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vswitchd.at:47"
 ( $at_check_trace; ovs-vsctl list int p1 | grep statistics | sed -n 's/^.*\(rx_packets=[0-9][0-9]*\).*$/\1/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71882,7 +71910,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:50: ovs-vsctl set O . other_config:stats-update-interval=100000"
 at_fn_check_prepare_trace "ovs-vswitchd.at:50"
 ( $at_check_trace; ovs-vsctl set O . other_config:stats-update-interval=100000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71899,7 +71927,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:53: ovs-appctl netdev-dummy/receive p1 'eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "ovs-vswitchd.at:53"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71917,7 +71945,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:56: ovs-vsctl list int p1 | grep statistics | sed -n 's/^.*\\(rx_packets=[0-9][0-9]*\\).*\$/\\1/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vswitchd.at:56"
 ( $at_check_trace; ovs-vsctl list int p1 | grep statistics | sed -n 's/^.*\(rx_packets=[0-9][0-9]*\).*$/\1/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71937,7 +71965,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:59: ovs-vsctl list int p1 | grep statistics | sed -n 's/^.*\\(rx_packets=[0-9][0-9]*\\).*\$/\\1/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vswitchd.at:59"
 ( $at_check_trace; ovs-vsctl list int p1 | grep statistics | sed -n 's/^.*\(rx_packets=[0-9][0-9]*\).*$/\1/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71956,7 +71984,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:62: ovs-vsctl clear O . other_config"
 at_fn_check_prepare_trace "ovs-vswitchd.at:62"
 ( $at_check_trace; ovs-vsctl clear O . other_config
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71971,7 +71999,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:63: ovs-appctl netdev-dummy/receive p1 'eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "ovs-vswitchd.at:63"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -71988,7 +72016,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:65: ovs-vsctl list int p1 | grep statistics | sed -n 's/^.*\\(rx_packets=[0-9][0-9]*\\).*\$/\\1/p'"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vswitchd.at:65"
 ( $at_check_trace; ovs-vsctl list int p1 | grep statistics | sed -n 's/^.*\(rx_packets=[0-9][0-9]*\).*$/\1/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72007,7 +72035,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:67: check_logs "
 at_fn_check_prepare_trace "ovs-vswitchd.at:67"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72022,7 +72050,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:67: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-vswitchd.at:67"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72037,7 +72065,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:67: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-vswitchd.at:67"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72052,13 +72080,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_673
-#AT_START_674
-at_fn_group_banner 674 'ovs-vswitchd.at:71' \
+#AT_STOP_674
+#AT_START_675
+at_fn_group_banner 675 'ovs-vswitchd.at:71' \
   "ovs-vswitchd -- start additional ovs-vswitchd process" "" 48
 at_xfail=no
 (
-  $as_echo "674. $at_setup_line: testing $at_desc ..."
+  $as_echo "675. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -72071,7 +72099,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:72: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vswitchd.at:72"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72085,7 +72113,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:72: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-vswitchd.at:72"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -72107,7 +72135,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72122,7 +72150,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:72: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-vswitchd.at:72"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72137,7 +72165,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:72: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-vswitchd.at:72"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -72169,7 +72197,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72186,7 +72214,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:72: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-vswitchd.at:72"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72214,7 +72242,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:85: test \`grep ERR fakelog | wc -l\` -eq 1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vswitchd.at:85"
 ( $at_check_trace; test `grep ERR fakelog | wc -l` -eq 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72230,7 +72258,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:87: tail -n1 fakelog | sed -e 's/^.*ERR|//; s/pid [0-9]*//'"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vswitchd.at:87"
 ( $at_check_trace; tail -n1 fakelog | sed -e 's/^.*ERR|//; s/pid [0-9]*//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72248,7 +72276,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:91: check_logs "
 at_fn_check_prepare_trace "ovs-vswitchd.at:91"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72263,7 +72291,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:91: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-vswitchd.at:91"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72278,7 +72306,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:91: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-vswitchd.at:91"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72293,13 +72321,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_674
-#AT_START_675
-at_fn_group_banner 675 'ovs-vswitchd.at:95' \
+#AT_STOP_675
+#AT_START_676
+at_fn_group_banner 676 'ovs-vswitchd.at:95' \
   "ovs-vswitchd -- switch over to another ovs-vswitchd process" "" 48
 at_xfail=no
 (
-  $as_echo "675. $at_setup_line: testing $at_desc ..."
+  $as_echo "676. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -72312,7 +72340,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:96: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vswitchd.at:96"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72326,7 +72354,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:96: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-vswitchd.at:96"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -72348,7 +72376,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72363,7 +72391,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:96: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-vswitchd.at:96"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72378,7 +72406,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:96: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-vswitchd.at:96"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -72410,7 +72438,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72427,7 +72455,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:96: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-vswitchd.at:96"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72458,7 +72486,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vswitchd.at:110"
 ( $at_check_trace; grep "bridge br0" fakelog | sed -e 's/port [0-9]*$/port/;
 s/datapath ID [a-z0-9]*$/datapath ID/;s/^.*INFO|//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72493,7 +72521,7 @@
 /|ERR|/p
 /|EMER|/p" fakelog
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72511,13 +72539,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_675
-#AT_START_676
-at_fn_group_banner 676 'ovs-vswitchd.at:134' \
+#AT_STOP_676
+#AT_START_677
+at_fn_group_banner 677 'ovs-vswitchd.at:134' \
   "ovs-vswitchd -- invalid database path" "          " 48
 at_xfail=no
 (
-  $as_echo "676. $at_setup_line: testing $at_desc ..."
+  $as_echo "677. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -72535,7 +72563,7 @@
 $as_echo "$at_srcdir/ovs-vswitchd.at:146: grep \"wakeup due to\" fakelog"
 at_fn_check_prepare_trace "ovs-vswitchd.at:146"
 ( $at_check_trace; grep "wakeup due to" fakelog
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72558,7 +72586,7 @@
 /|ERR|/p
 /|EMER|/p" fakelog
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72572,13 +72600,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_676
-#AT_START_677
-at_fn_group_banner 677 'ofproto.at:3' \
-  "ofproto - echo request" "                         " 49
+#AT_STOP_677
+#AT_START_678
+at_fn_group_banner 678 'ovs-vswitchd.at:158' \
+  "ovs-vswitchd - do not create sockets with unsafe names" "" 48
 at_xfail=no
 (
-  $as_echo "677. $at_setup_line: testing $at_desc ..."
+  $as_echo "678. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -72588,29 +72616,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:4: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:4"
+$as_echo "$at_srcdir/ovs-vswitchd.at:159: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vswitchd.at:159"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:159"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:4: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:4"
+$as_echo "$at_srcdir/ovs-vswitchd.at:159: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-vswitchd.at:159"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:159"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -72620,49 +72648,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:4: sed < stderr '
+$as_echo "$at_srcdir/ovs-vswitchd.at:159: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:4"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-vswitchd.at:159"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:159"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:4: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:4"
+$as_echo "$at_srcdir/ovs-vswitchd.at:159: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ovs-vswitchd.at:159"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:159"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:4: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:4"
+$as_echo "$at_srcdir/ovs-vswitchd.at:159: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ovs-vswitchd.at:159"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:159"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -72674,14 +72702,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:4: sed < stderr '
+$as_echo "$at_srcdir/ovs-vswitchd.at:159: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:4"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-vswitchd.at:159"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -72689,12 +72717,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:159"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -72703,76 +72731,141 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:4: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:4"
+$as_echo "$at_srcdir/ovs-vswitchd.at:159: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ovs-vswitchd.at:159"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:159"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
+
+# On Unix systems, test for sockets with "test -S".
+#
+# On Windows systems, we simulate a socket with a regular file that contains
+# a TCP port number, so use "test -f" there instead.
+if test $IS_WIN32 = yes; then
+   S=f
+else
+   S=S
+fi
+
+# Create a bridge with an ordinary name and make sure that the management
+# socket gets creatd.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:5: ovs-ofctl -vwarn probe br0"
-at_fn_check_prepare_trace "ofproto.at:5"
-( $at_check_trace; ovs-ofctl -vwarn probe br0
-) >>"$at_stdout" 2>>"$at_stderr"
+$as_echo "$at_srcdir/ovs-vswitchd.at:173: ovs-vsctl add-br a -- set bridge a datapath-type=dummy"
+at_fn_check_prepare_trace "ovs-vswitchd.at:173"
+( $at_check_trace; ovs-vsctl add-br a -- set bridge a datapath-type=dummy
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:5"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:173"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:6: check_logs "
-at_fn_check_prepare_trace "ofproto.at:6"
-( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+$as_echo "$at_srcdir/ovs-vswitchd.at:174: test -\$S a.mgmt"
+at_fn_check_prepare_dynamic "test -$S a.mgmt" "ovs-vswitchd.at:174"
+( $at_check_trace; test -$S a.mgmt
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:6"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:174"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+# Create a bridge with an unsafe name and make sure that the management
+# socket does not get created.
+mkdir b
+{ set +x
+$as_echo "$at_srcdir/ovs-vswitchd.at:179: ovs-vsctl add-br b/c -- set bridge b/c datapath-type=dummy"
+at_fn_check_prepare_trace "ovs-vswitchd.at:179"
+( $at_check_trace; ovs-vsctl add-br b/c -- set bridge b/c datapath-type=dummy
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'b/c'.  See ovs-vswitchd log for details.
+" | \
+  $at_diff - "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:179"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/ovs-vswitchd.at:182: test ! -e b/c.mgmt"
+at_fn_check_prepare_trace "ovs-vswitchd.at:182"
+( $at_check_trace; test ! -e b/c.mgmt
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:182"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+{ set +x
+$as_echo "$at_srcdir/ovs-vswitchd.at:184: check_logs '/ignoring bridge with invalid name/d'"
+at_fn_check_prepare_trace "ovs-vswitchd.at:184"
+( $at_check_trace; check_logs '/ignoring bridge with invalid name/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:184"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:6: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:6"
+$as_echo "$at_srcdir/ovs-vswitchd.at:184: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ovs-vswitchd.at:184"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:6"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:184"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:6: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:6"
+$as_echo "$at_srcdir/ovs-vswitchd.at:184: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-vswitchd.at:184"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:6"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-vswitchd.at:184"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -72782,13 +72875,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_677
-#AT_START_678
-at_fn_group_banner 678 'ofproto.at:9' \
-  "ofproto - handling messages with bad version" "   " 49
+#AT_STOP_678
+#AT_START_679
+at_fn_group_banner 679 'ofproto.at:3' \
+  "ofproto - echo request" "                         " 49
 at_xfail=no
 (
-  $as_echo "678. $at_setup_line: testing $at_desc ..."
+  $as_echo "679. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -72798,29 +72891,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:10: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:10"
+$as_echo "$at_srcdir/ofproto.at:4: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:4"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:10: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:10"
+$as_echo "$at_srcdir/ofproto.at:4: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:4"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -72830,49 +72923,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:10: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:4: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:10"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:4"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:10: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:10"
+$as_echo "$at_srcdir/ofproto.at:4: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:4"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:10: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:10"
+$as_echo "$at_srcdir/ofproto.at:4: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:4"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -72884,14 +72977,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:10: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:4: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:10"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:4"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -72899,12 +72992,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -72913,41 +73006,251 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:10: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:10"
+$as_echo "$at_srcdir/ofproto.at:4: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:4"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:4"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-
-# Start a monitor running OpenFlow 1.0, then send the switch an OF1.1 features
-# request
 { set +x
-$as_echo "$at_srcdir/ofproto.at:14: ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile"
-at_fn_check_prepare_trace "ofproto.at:14"
-( $at_check_trace; ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+$as_echo "$at_srcdir/ofproto.at:5: ovs-ofctl -vwarn probe br0"
+at_fn_check_prepare_trace "ofproto.at:5"
+( $at_check_trace; ovs-ofctl -vwarn probe br0
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:14"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:5"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
-ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log
-
+{ set +x
+$as_echo "$at_srcdir/ofproto.at:6: check_logs "
+at_fn_check_prepare_trace "ofproto.at:6"
+( $at_check_trace; check_logs
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:6"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ofproto.at:6: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:6"
+( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:6"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ofproto.at:6: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:6"
+( $at_check_trace; ovs-appctl -t ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:6"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_679
+#AT_START_680
+at_fn_group_banner 680 'ofproto.at:9' \
+  "ofproto - handling messages with bad version" "   " 49
+at_xfail=no
+(
+  $as_echo "680. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+OVS_RUNDIR=`pwd`; export OVS_RUNDIR
+   OVS_LOGDIR=`pwd`; export OVS_LOGDIR
+   OVS_DBDIR=`pwd`; export OVS_DBDIR
+   OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR
+
+      touch .conf.db.~lock~
+   { set +x
+$as_echo "$at_srcdir/ofproto.at:10: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:10"
+( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/ofproto.at:10: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:10"
+( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+    trap '. ./cleanup' 0; cat - cleanup << EOF > __cleanup
+kill `cat ovsdb-server.pid`
+EOF
+mv __cleanup cleanup
+
+   { set +x
+$as_echo "$at_srcdir/ofproto.at:10: sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:10"
+( $at_check_trace; sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+      { set +x
+$as_echo "$at_srcdir/ofproto.at:10: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:10"
+( $at_check_trace; ovs-vsctl --no-wait init
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/ofproto.at:10: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:10"
+( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+   trap '. ./cleanup' 0; cat - cleanup << EOF > __cleanup
+kill `cat ovs-vswitchd.pid`
+EOF
+mv __cleanup cleanup
+
+   { set +x
+$as_echo "$at_srcdir/ofproto.at:10: sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/ofproto|INFO|using datapath ID/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:10"
+( $at_check_trace; sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/ofproto|INFO|using datapath ID/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+      { set +x
+$as_echo "$at_srcdir/ofproto.at:10: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:10"
+( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:10"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+# Start a monitor running OpenFlow 1.0, then send the switch an OF1.1 features
+# request
+{ set +x
+$as_echo "$at_srcdir/ofproto.at:14: ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile"
+at_fn_check_prepare_trace "ofproto.at:14"
+( $at_check_trace; ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:14"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log
+
 ovs-appctl -t ovs-ofctl ofctl/send 0205000801234567
 ovs-appctl -t ovs-ofctl ofctl/barrier
 ovs-appctl -t ovs-ofctl exit
@@ -72958,7 +73261,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:21"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//
 /ECHO/d' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72980,7 +73283,7 @@
 $as_echo "$at_srcdir/ofproto.at:29: check_logs \"/received OpenFlow version 0x02 != expected 01/d\""
 at_fn_check_prepare_trace "ofproto.at:29"
 ( $at_check_trace; check_logs "/received OpenFlow version 0x02 != expected 01/d"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -72996,7 +73299,7 @@
 $as_echo "$at_srcdir/ofproto.at:29: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:29"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73012,7 +73315,7 @@
 $as_echo "$at_srcdir/ofproto.at:29: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:29"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73028,13 +73331,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_678
-#AT_START_679
-at_fn_group_banner 679 'ofproto.at:32' \
+#AT_STOP_680
+#AT_START_681
+at_fn_group_banner 681 'ofproto.at:32' \
   "ofproto - feature request, config request" "      " 49
 at_xfail=no
 (
-  $as_echo "679. $at_setup_line: testing $at_desc ..."
+  $as_echo "681. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -73047,7 +73350,7 @@
 $as_echo "$at_srcdir/ofproto.at:33: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:33"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73061,7 +73364,7 @@
 $as_echo "$at_srcdir/ofproto.at:33: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:33"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -73083,7 +73386,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73098,7 +73401,7 @@
 $as_echo "$at_srcdir/ofproto.at:33: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:33"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73113,7 +73416,7 @@
 $as_echo "$at_srcdir/ofproto.at:33: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:33"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -73145,7 +73448,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73162,7 +73465,7 @@
 $as_echo "$at_srcdir/ofproto.at:33: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:33"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73178,7 +73481,7 @@
 $as_echo "$at_srcdir/ofproto.at:34: ovs-ofctl -vwarn show br0"
 at_fn_check_prepare_trace "ofproto.at:34"
 ( $at_check_trace; ovs-ofctl -vwarn show br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73193,7 +73496,7 @@
 $as_echo "$at_srcdir/ofproto.at:35: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:35"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73218,7 +73521,7 @@
 $as_echo "$at_srcdir/ofproto.at:46: check_logs "
 at_fn_check_prepare_trace "ofproto.at:46"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73233,7 +73536,7 @@
 $as_echo "$at_srcdir/ofproto.at:46: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:46"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73248,7 +73551,7 @@
 $as_echo "$at_srcdir/ofproto.at:46: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:46"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73263,13 +73566,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_679
-#AT_START_680
-at_fn_group_banner 680 'ofproto.at:49' \
+#AT_STOP_681
+#AT_START_682
+at_fn_group_banner 682 'ofproto.at:49' \
   "ofproto - set OpenFlow port number" "             " 49
 at_xfail=no
 (
-  $as_echo "680. $at_setup_line: testing $at_desc ..."
+  $as_echo "682. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -73282,7 +73585,7 @@
 $as_echo "$at_srcdir/ofproto.at:50: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:50"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73296,7 +73599,7 @@
 $as_echo "$at_srcdir/ofproto.at:50: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:50"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -73318,7 +73621,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73333,7 +73636,7 @@
 $as_echo "$at_srcdir/ofproto.at:50: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:50"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73348,7 +73651,7 @@
 $as_echo "$at_srcdir/ofproto.at:50: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:50"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -73380,7 +73683,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73399,7 +73702,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:50"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy --\
         add-port br0 p2 -- set Interface p2 type=dummy ofport_request=99
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73415,7 +73718,7 @@
 $as_echo "$at_srcdir/ofproto.at:53: ovs-ofctl -vwarn show br0"
 at_fn_check_prepare_trace "ofproto.at:53"
 ( $at_check_trace; ovs-ofctl -vwarn show br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73434,7 +73737,7 @@
 ( $at_check_trace; sed '
 s/ (xid=0x[0-9a-fA-F]*)//
 s/00:0.$/00:0x/' < stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73468,7 +73771,7 @@
 $as_echo "$at_srcdir/ofproto.at:77: check_logs "
 at_fn_check_prepare_trace "ofproto.at:77"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73483,7 +73786,7 @@
 $as_echo "$at_srcdir/ofproto.at:77: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:77"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73498,7 +73801,7 @@
 $as_echo "$at_srcdir/ofproto.at:77: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:77"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73513,13 +73816,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_680
-#AT_START_681
-at_fn_group_banner 681 'ofproto.at:82' \
+#AT_STOP_682
+#AT_START_683
+at_fn_group_banner 683 'ofproto.at:82' \
   "ofproto - port stats - (OpenFlow 1.0)" "          " 49
 at_xfail=no
 (
-  $as_echo "681. $at_setup_line: testing $at_desc ..."
+  $as_echo "683. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -73532,7 +73835,7 @@
 $as_echo "$at_srcdir/ofproto.at:83: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:83"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73546,7 +73849,7 @@
 $as_echo "$at_srcdir/ofproto.at:83: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:83"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -73568,7 +73871,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73583,7 +73886,7 @@
 $as_echo "$at_srcdir/ofproto.at:83: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:83"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73598,7 +73901,7 @@
 $as_echo "$at_srcdir/ofproto.at:83: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:83"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -73630,7 +73933,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73647,7 +73950,7 @@
 $as_echo "$at_srcdir/ofproto.at:83: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:83"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73663,7 +73966,7 @@
 $as_echo "$at_srcdir/ofproto.at:84: ovs-ofctl -vwarn dump-ports br0"
 at_fn_check_prepare_trace "ofproto.at:84"
 ( $at_check_trace; ovs-ofctl -vwarn dump-ports br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73678,7 +73981,7 @@
 $as_echo "$at_srcdir/ofproto.at:85: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:85"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73697,7 +74000,7 @@
 $as_echo "$at_srcdir/ofproto.at:90: check_logs "
 at_fn_check_prepare_trace "ofproto.at:90"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73712,7 +74015,7 @@
 $as_echo "$at_srcdir/ofproto.at:90: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:90"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73727,7 +74030,7 @@
 $as_echo "$at_srcdir/ofproto.at:90: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:90"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73742,13 +74045,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_681
-#AT_START_682
-at_fn_group_banner 682 'ofproto.at:93' \
+#AT_STOP_683
+#AT_START_684
+at_fn_group_banner 684 'ofproto.at:93' \
   "ofproto - port stats - (OpenFlow 1.2)" "          " 49
 at_xfail=no
 (
-  $as_echo "682. $at_setup_line: testing $at_desc ..."
+  $as_echo "684. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -73761,7 +74064,7 @@
 $as_echo "$at_srcdir/ofproto.at:94: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:94"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73775,7 +74078,7 @@
 $as_echo "$at_srcdir/ofproto.at:94: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:94"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -73797,7 +74100,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73812,7 +74115,7 @@
 $as_echo "$at_srcdir/ofproto.at:94: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:94"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73827,7 +74130,7 @@
 $as_echo "$at_srcdir/ofproto.at:94: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:94"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -73859,7 +74162,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73876,7 +74179,7 @@
 $as_echo "$at_srcdir/ofproto.at:94: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:94"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73892,7 +74195,7 @@
 $as_echo "$at_srcdir/ofproto.at:95: ovs-ofctl -O OpenFlow12 -vwarn dump-ports br0"
 at_fn_check_prepare_trace "ofproto.at:95"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 -vwarn dump-ports br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73907,7 +74210,7 @@
 $as_echo "$at_srcdir/ofproto.at:96: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:96"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73926,7 +74229,7 @@
 $as_echo "$at_srcdir/ofproto.at:101: check_logs "
 at_fn_check_prepare_trace "ofproto.at:101"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73941,7 +74244,7 @@
 $as_echo "$at_srcdir/ofproto.at:101: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:101"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73956,7 +74259,7 @@
 $as_echo "$at_srcdir/ofproto.at:101: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:101"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -73971,13 +74274,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_682
-#AT_START_683
-at_fn_group_banner 683 'ofproto.at:104' \
+#AT_STOP_684
+#AT_START_685
+at_fn_group_banner 685 'ofproto.at:104' \
   "ofproto - port stats - (OpenFlow 1.4)" "          " 49
 at_xfail=no
 (
-  $as_echo "683. $at_setup_line: testing $at_desc ..."
+  $as_echo "685. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -73990,7 +74293,7 @@
 $as_echo "$at_srcdir/ofproto.at:105: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:105"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74004,7 +74307,7 @@
 $as_echo "$at_srcdir/ofproto.at:105: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:105"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -74026,7 +74329,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74041,7 +74344,7 @@
 $as_echo "$at_srcdir/ofproto.at:105: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:105"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74056,7 +74359,7 @@
 $as_echo "$at_srcdir/ofproto.at:105: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:105"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -74088,7 +74391,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74105,7 +74408,7 @@
 $as_echo "$at_srcdir/ofproto.at:105: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:105"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74121,7 +74424,7 @@
 $as_echo "$at_srcdir/ofproto.at:106: ovs-ofctl -O OpenFlow14 -vwarn dump-ports br0"
 at_fn_check_prepare_trace "ofproto.at:106"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 -vwarn dump-ports br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74136,7 +74439,7 @@
 $as_echo "$at_srcdir/ofproto.at:107: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/'"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:107"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74156,7 +74459,7 @@
 $as_echo "$at_srcdir/ofproto.at:114: check_logs "
 at_fn_check_prepare_trace "ofproto.at:114"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74171,7 +74474,7 @@
 $as_echo "$at_srcdir/ofproto.at:114: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:114"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74186,7 +74489,7 @@
 $as_echo "$at_srcdir/ofproto.at:114: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:114"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74201,13 +74504,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_683
-#AT_START_684
-at_fn_group_banner 684 'ofproto.at:119' \
+#AT_STOP_685
+#AT_START_686
+at_fn_group_banner 686 'ofproto.at:119' \
   "ofproto - port-desc stats (OpenFlow 1.0)" "       " 49
 at_xfail=no
 (
-  $as_echo "684. $at_setup_line: testing $at_desc ..."
+  $as_echo "686. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -74220,7 +74523,7 @@
 $as_echo "$at_srcdir/ofproto.at:120: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:120"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74234,7 +74537,7 @@
 $as_echo "$at_srcdir/ofproto.at:120: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:120"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -74256,7 +74559,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74271,7 +74574,7 @@
 $as_echo "$at_srcdir/ofproto.at:120: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:120"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74286,7 +74589,7 @@
 $as_echo "$at_srcdir/ofproto.at:120: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:120"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -74318,7 +74621,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74335,7 +74638,7 @@
 $as_echo "$at_srcdir/ofproto.at:120: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:120"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74351,7 +74654,7 @@
 $as_echo "$at_srcdir/ofproto.at:121: ovs-ofctl -vwarn dump-ports-desc br0"
 at_fn_check_prepare_trace "ofproto.at:121"
 ( $at_check_trace; ovs-ofctl -vwarn dump-ports-desc br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74366,7 +74669,7 @@
 $as_echo "$at_srcdir/ofproto.at:122: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:122"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74387,7 +74690,7 @@
 $as_echo "$at_srcdir/ofproto.at:129: check_logs "
 at_fn_check_prepare_trace "ofproto.at:129"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74402,7 +74705,7 @@
 $as_echo "$at_srcdir/ofproto.at:129: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:129"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74417,7 +74720,7 @@
 $as_echo "$at_srcdir/ofproto.at:129: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:129"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74432,13 +74735,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_684
-#AT_START_685
-at_fn_group_banner 685 'ofproto.at:134' \
+#AT_STOP_686
+#AT_START_687
+at_fn_group_banner 687 'ofproto.at:134' \
   "ofproto - port-desc stats (OpenFlow 1.2)" "       " 49
 at_xfail=no
 (
-  $as_echo "685. $at_setup_line: testing $at_desc ..."
+  $as_echo "687. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -74451,7 +74754,7 @@
 $as_echo "$at_srcdir/ofproto.at:135: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:135"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74465,7 +74768,7 @@
 $as_echo "$at_srcdir/ofproto.at:135: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:135"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -74487,7 +74790,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74502,7 +74805,7 @@
 $as_echo "$at_srcdir/ofproto.at:135: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:135"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74517,7 +74820,7 @@
 $as_echo "$at_srcdir/ofproto.at:135: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:135"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -74549,7 +74852,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74566,7 +74869,7 @@
 $as_echo "$at_srcdir/ofproto.at:135: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:135"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74582,7 +74885,7 @@
 $as_echo "$at_srcdir/ofproto.at:136: ovs-ofctl -O OpenFlow12 -vwarn dump-ports-desc br0"
 at_fn_check_prepare_trace "ofproto.at:136"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 -vwarn dump-ports-desc br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74597,7 +74900,7 @@
 $as_echo "$at_srcdir/ofproto.at:137: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:137"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74618,7 +74921,7 @@
 $as_echo "$at_srcdir/ofproto.at:144: check_logs "
 at_fn_check_prepare_trace "ofproto.at:144"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74633,7 +74936,7 @@
 $as_echo "$at_srcdir/ofproto.at:144: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:144"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74648,7 +74951,7 @@
 $as_echo "$at_srcdir/ofproto.at:144: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:144"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74663,13 +74966,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_685
-#AT_START_686
-at_fn_group_banner 686 'ofproto.at:147' \
+#AT_STOP_687
+#AT_START_688
+at_fn_group_banner 688 'ofproto.at:147' \
   "ofproto - port-desc stats (OpenFlow 1.5)" "       " 49
 at_xfail=no
 (
-  $as_echo "686. $at_setup_line: testing $at_desc ..."
+  $as_echo "688. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -74682,7 +74985,7 @@
 $as_echo "$at_srcdir/ofproto.at:148: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:148"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74696,7 +74999,7 @@
 $as_echo "$at_srcdir/ofproto.at:148: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:148"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -74718,7 +75021,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74733,7 +75036,7 @@
 $as_echo "$at_srcdir/ofproto.at:148: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:148"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74748,7 +75051,7 @@
 $as_echo "$at_srcdir/ofproto.at:148: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:148"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -74780,7 +75083,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74797,7 +75100,7 @@
 $as_echo "$at_srcdir/ofproto.at:148: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:148"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74817,7 +75120,7 @@
 $as_echo "$at_srcdir/ofproto.at:150: ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-ports-desc br0"
 at_fn_check_prepare_trace "ofproto.at:150"
 ( $at_check_trace; ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-ports-desc br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74832,7 +75135,7 @@
 $as_echo "$at_srcdir/ofproto.at:151: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/00:0./00:0x/'"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:151"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/00:0./00:0x/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74865,7 +75168,7 @@
 $as_echo "$at_srcdir/ofproto.at:170: ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-ports-desc br0 2"
 at_fn_check_prepare_trace "ofproto.at:170"
 ( $at_check_trace; ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-ports-desc br0 2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74880,7 +75183,7 @@
 $as_echo "$at_srcdir/ofproto.at:171: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/00:0./00:0x/'"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:171"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/00:0./00:0x/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74901,7 +75204,7 @@
 $as_echo "$at_srcdir/ofproto.at:178: check_logs "
 at_fn_check_prepare_trace "ofproto.at:178"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74916,7 +75219,7 @@
 $as_echo "$at_srcdir/ofproto.at:178: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:178"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74931,7 +75234,7 @@
 $as_echo "$at_srcdir/ofproto.at:178: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:178"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74946,13 +75249,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_686
-#AT_START_687
-at_fn_group_banner 687 'ofproto.at:183' \
+#AT_STOP_688
+#AT_START_689
+at_fn_group_banner 689 'ofproto.at:183' \
   "ofproto - queue stats - (OpenFlow 1.0)" "         " 49
 at_xfail=no
 (
-  $as_echo "687. $at_setup_line: testing $at_desc ..."
+  $as_echo "689. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -74965,7 +75268,7 @@
 $as_echo "$at_srcdir/ofproto.at:184: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:184"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -74979,7 +75282,7 @@
 $as_echo "$at_srcdir/ofproto.at:184: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:184"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -75001,7 +75304,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75016,7 +75319,7 @@
 $as_echo "$at_srcdir/ofproto.at:184: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:184"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75031,7 +75334,7 @@
 $as_echo "$at_srcdir/ofproto.at:184: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:184"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -75063,7 +75366,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75080,7 +75383,7 @@
 $as_echo "$at_srcdir/ofproto.at:184: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:184"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75096,7 +75399,7 @@
 $as_echo "$at_srcdir/ofproto.at:185: ovs-ofctl -vwarn queue-stats br0"
 at_fn_check_prepare_trace "ofproto.at:185"
 ( $at_check_trace; ovs-ofctl -vwarn queue-stats br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75111,7 +75414,7 @@
 $as_echo "$at_srcdir/ofproto.at:186: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:186"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75128,7 +75431,7 @@
 $as_echo "$at_srcdir/ofproto.at:189: ovs-ofctl -vwarn queue-stats br0 ANY 5"
 at_fn_check_prepare_trace "ofproto.at:189"
 ( $at_check_trace; ovs-ofctl -vwarn queue-stats br0 ANY 5
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75146,7 +75449,7 @@
 $as_echo "$at_srcdir/ofproto.at:193: ovs-ofctl -vwarn queue-stats br0 10"
 at_fn_check_prepare_trace "ofproto.at:193"
 ( $at_check_trace; ovs-ofctl -vwarn queue-stats br0 10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75164,7 +75467,7 @@
 $as_echo "$at_srcdir/ofproto.at:197: check_logs "
 at_fn_check_prepare_trace "ofproto.at:197"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75179,7 +75482,7 @@
 $as_echo "$at_srcdir/ofproto.at:197: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:197"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75194,7 +75497,7 @@
 $as_echo "$at_srcdir/ofproto.at:197: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:197"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75209,13 +75512,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_687
-#AT_START_688
-at_fn_group_banner 688 'ofproto.at:200' \
+#AT_STOP_689
+#AT_START_690
+at_fn_group_banner 690 'ofproto.at:200' \
   "ofproto - queue stats - (OpenFlow 1.2)" "         " 49
 at_xfail=no
 (
-  $as_echo "688. $at_setup_line: testing $at_desc ..."
+  $as_echo "690. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -75228,7 +75531,7 @@
 $as_echo "$at_srcdir/ofproto.at:201: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:201"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75242,7 +75545,7 @@
 $as_echo "$at_srcdir/ofproto.at:201: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:201"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -75264,7 +75567,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75279,7 +75582,7 @@
 $as_echo "$at_srcdir/ofproto.at:201: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:201"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75294,7 +75597,7 @@
 $as_echo "$at_srcdir/ofproto.at:201: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:201"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -75326,7 +75629,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75343,7 +75646,7 @@
 $as_echo "$at_srcdir/ofproto.at:201: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:201"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75359,7 +75662,7 @@
 $as_echo "$at_srcdir/ofproto.at:202: ovs-ofctl -O OpenFlow12 -vwarn queue-stats br0"
 at_fn_check_prepare_trace "ofproto.at:202"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 -vwarn queue-stats br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75374,7 +75677,7 @@
 $as_echo "$at_srcdir/ofproto.at:203: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:203"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75391,7 +75694,7 @@
 $as_echo "$at_srcdir/ofproto.at:206: ovs-ofctl -O OpenFlow12 -vwarn queue-stats br0 ALL 5"
 at_fn_check_prepare_trace "ofproto.at:206"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 -vwarn queue-stats br0 ALL 5
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75409,7 +75712,7 @@
 $as_echo "$at_srcdir/ofproto.at:210: ovs-ofctl -O OpenFlow12 -vwarn queue-stats br0 10"
 at_fn_check_prepare_trace "ofproto.at:210"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 -vwarn queue-stats br0 10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75427,7 +75730,7 @@
 $as_echo "$at_srcdir/ofproto.at:214: check_logs "
 at_fn_check_prepare_trace "ofproto.at:214"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75442,7 +75745,7 @@
 $as_echo "$at_srcdir/ofproto.at:214: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:214"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75457,7 +75760,7 @@
 $as_echo "$at_srcdir/ofproto.at:214: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:214"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75472,13 +75775,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_688
-#AT_START_689
-at_fn_group_banner 689 'ofproto.at:217' \
+#AT_STOP_690
+#AT_START_691
+at_fn_group_banner 691 'ofproto.at:217' \
   "ofproto - queue stats - (OpenFlow 1.4)" "         " 49
 at_xfail=no
 (
-  $as_echo "689. $at_setup_line: testing $at_desc ..."
+  $as_echo "691. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -75491,7 +75794,7 @@
 $as_echo "$at_srcdir/ofproto.at:218: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:218"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75505,7 +75808,7 @@
 $as_echo "$at_srcdir/ofproto.at:218: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:218"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -75527,7 +75830,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75542,7 +75845,7 @@
 $as_echo "$at_srcdir/ofproto.at:218: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:218"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75557,7 +75860,7 @@
 $as_echo "$at_srcdir/ofproto.at:218: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:218"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -75589,7 +75892,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75606,7 +75909,7 @@
 $as_echo "$at_srcdir/ofproto.at:218: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:218"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75622,7 +75925,7 @@
 $as_echo "$at_srcdir/ofproto.at:219: ovs-ofctl -O OpenFlow14 -vwarn queue-stats br0"
 at_fn_check_prepare_trace "ofproto.at:219"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 -vwarn queue-stats br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75637,7 +75940,7 @@
 $as_echo "$at_srcdir/ofproto.at:220: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:220"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75654,7 +75957,7 @@
 $as_echo "$at_srcdir/ofproto.at:223: ovs-ofctl -O OpenFlow14 -vwarn queue-stats br0 ALL 5"
 at_fn_check_prepare_trace "ofproto.at:223"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 -vwarn queue-stats br0 ALL 5
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75672,7 +75975,7 @@
 $as_echo "$at_srcdir/ofproto.at:227: ovs-ofctl -O OpenFlow14 -vwarn queue-stats br0 10"
 at_fn_check_prepare_trace "ofproto.at:227"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 -vwarn queue-stats br0 10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75690,7 +75993,7 @@
 $as_echo "$at_srcdir/ofproto.at:231: check_logs "
 at_fn_check_prepare_trace "ofproto.at:231"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75705,7 +76008,7 @@
 $as_echo "$at_srcdir/ofproto.at:231: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:231"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75720,7 +76023,7 @@
 $as_echo "$at_srcdir/ofproto.at:231: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:231"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75735,13 +76038,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_689
-#AT_START_690
-at_fn_group_banner 690 'ofproto.at:236' \
+#AT_STOP_691
+#AT_START_692
+at_fn_group_banner 692 'ofproto.at:236' \
   "ofproto - queue configuration - (OpenFlow 1.0)" " " 49
 at_xfail=no
 (
-  $as_echo "690. $at_setup_line: testing $at_desc ..."
+  $as_echo "692. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -75754,7 +76057,7 @@
 $as_echo "$at_srcdir/ofproto.at:237: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:237"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75768,7 +76071,7 @@
 $as_echo "$at_srcdir/ofproto.at:237: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:237"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -75790,7 +76093,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75805,7 +76108,7 @@
 $as_echo "$at_srcdir/ofproto.at:237: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:237"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75820,7 +76123,7 @@
 $as_echo "$at_srcdir/ofproto.at:237: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:237"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -75852,7 +76155,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75869,7 +76172,7 @@
 $as_echo "$at_srcdir/ofproto.at:237: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:237"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75888,7 +76191,7 @@
 $as_echo "$at_srcdir/ofproto.at:239: ovs-ofctl queue-get-config br0 1"
 at_fn_check_prepare_trace "ofproto.at:239"
 ( $at_check_trace; ovs-ofctl queue-get-config br0 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75903,7 +76206,7 @@
 $as_echo "$at_srcdir/ofproto.at:240: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:240"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75920,7 +76223,7 @@
 $as_echo "$at_srcdir/ofproto.at:243: ovs-ofctl queue-get-config br0 10"
 at_fn_check_prepare_trace "ofproto.at:243"
 ( $at_check_trace; ovs-ofctl queue-get-config br0 10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75938,7 +76241,7 @@
 $as_echo "$at_srcdir/ofproto.at:247: check_logs "
 at_fn_check_prepare_trace "ofproto.at:247"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75953,7 +76256,7 @@
 $as_echo "$at_srcdir/ofproto.at:247: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:247"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75968,7 +76271,7 @@
 $as_echo "$at_srcdir/ofproto.at:247: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:247"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -75983,13 +76286,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_690
-#AT_START_691
-at_fn_group_banner 691 'ofproto.at:250' \
+#AT_STOP_692
+#AT_START_693
+at_fn_group_banner 693 'ofproto.at:250' \
   "ofproto - queue configuration - (OpenFlow 1.2)" " " 49
 at_xfail=no
 (
-  $as_echo "691. $at_setup_line: testing $at_desc ..."
+  $as_echo "693. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -76002,7 +76305,7 @@
 $as_echo "$at_srcdir/ofproto.at:251: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:251"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76016,7 +76319,7 @@
 $as_echo "$at_srcdir/ofproto.at:251: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:251"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -76038,7 +76341,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76053,7 +76356,7 @@
 $as_echo "$at_srcdir/ofproto.at:251: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:251"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76068,7 +76371,7 @@
 $as_echo "$at_srcdir/ofproto.at:251: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:251"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -76100,7 +76403,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76117,7 +76420,7 @@
 $as_echo "$at_srcdir/ofproto.at:251: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:251"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76136,7 +76439,7 @@
 $as_echo "$at_srcdir/ofproto.at:253: ovs-ofctl -O OpenFlow12 queue-get-config br0 1"
 at_fn_check_prepare_trace "ofproto.at:253"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 queue-get-config br0 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76151,7 +76454,7 @@
 $as_echo "$at_srcdir/ofproto.at:254: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:254"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76168,7 +76471,7 @@
 $as_echo "$at_srcdir/ofproto.at:257: ovs-ofctl -O OpenFlow12 queue-get-config br0 10"
 at_fn_check_prepare_trace "ofproto.at:257"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 queue-get-config br0 10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76186,7 +76489,7 @@
 $as_echo "$at_srcdir/ofproto.at:261: check_logs "
 at_fn_check_prepare_trace "ofproto.at:261"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76201,7 +76504,7 @@
 $as_echo "$at_srcdir/ofproto.at:261: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:261"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76216,7 +76519,7 @@
 $as_echo "$at_srcdir/ofproto.at:261: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:261"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76231,13 +76534,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_691
-#AT_START_692
-at_fn_group_banner 692 'ofproto.at:267' \
+#AT_STOP_693
+#AT_START_694
+at_fn_group_banner 694 'ofproto.at:267' \
   "ofproto - no group support (OpenFlow 1.0)" "      " 49
 at_xfail=no
 (
-  $as_echo "692. $at_setup_line: testing $at_desc ..."
+  $as_echo "694. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -76250,7 +76553,7 @@
 $as_echo "$at_srcdir/ofproto.at:268: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:268"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76264,7 +76567,7 @@
 $as_echo "$at_srcdir/ofproto.at:268: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:268"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -76286,7 +76589,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76301,7 +76604,7 @@
 $as_echo "$at_srcdir/ofproto.at:268: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:268"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76316,7 +76619,7 @@
 $as_echo "$at_srcdir/ofproto.at:268: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:268"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -76348,7 +76651,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76365,7 +76668,7 @@
 $as_echo "$at_srcdir/ofproto.at:268: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:268"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76390,7 +76693,7 @@
 $as_echo "$at_srcdir/ofproto.at:276: ovs-ofctl -O OpenFlow10 -vwarn add-groups br0 groups.txt"
 at_fn_check_prepare_trace "ofproto.at:276"
 ( $at_check_trace; ovs-ofctl -O OpenFlow10 -vwarn add-groups br0 groups.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -76405,7 +76708,7 @@
 $as_echo "$at_srcdir/ofproto.at:277: ovs-ofctl -O OpenFlow10 -vwarn mod-group br0 'group_id=1234,type=all,bucket=output:10'"
 at_fn_check_prepare_trace "ofproto.at:277"
 ( $at_check_trace; ovs-ofctl -O OpenFlow10 -vwarn mod-group br0 'group_id=1234,type=all,bucket=output:10'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -76420,7 +76723,7 @@
 $as_echo "$at_srcdir/ofproto.at:278: ovs-ofctl -O OpenFlow10 -vwarn del-groups br0"
 at_fn_check_prepare_trace "ofproto.at:278"
 ( $at_check_trace; ovs-ofctl -O OpenFlow10 -vwarn del-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -76435,7 +76738,7 @@
 $as_echo "$at_srcdir/ofproto.at:279: ovs-ofctl -O OpenFlow10 -vwarn dump-groups br0 "
 at_fn_check_prepare_trace "ofproto.at:279"
 ( $at_check_trace; ovs-ofctl -O OpenFlow10 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -76450,7 +76753,7 @@
 $as_echo "$at_srcdir/ofproto.at:280: check_logs "
 at_fn_check_prepare_trace "ofproto.at:280"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76465,7 +76768,7 @@
 $as_echo "$at_srcdir/ofproto.at:280: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:280"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76480,7 +76783,7 @@
 $as_echo "$at_srcdir/ofproto.at:280: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:280"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76495,13 +76798,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_692
-#AT_START_693
-at_fn_group_banner 693 'ofproto.at:286' \
+#AT_STOP_694
+#AT_START_695
+at_fn_group_banner 695 'ofproto.at:286' \
   "ofproto - del group (OpenFlow 1.1)" "             " 49
 at_xfail=no
 (
-  $as_echo "693. $at_setup_line: testing $at_desc ..."
+  $as_echo "695. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -76514,7 +76817,7 @@
 $as_echo "$at_srcdir/ofproto.at:287: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:287"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76528,7 +76831,7 @@
 $as_echo "$at_srcdir/ofproto.at:287: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:287"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -76550,7 +76853,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76565,7 +76868,7 @@
 $as_echo "$at_srcdir/ofproto.at:287: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:287"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76580,7 +76883,7 @@
 $as_echo "$at_srcdir/ofproto.at:287: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:287"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -76612,7 +76915,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76629,7 +76932,7 @@
 $as_echo "$at_srcdir/ofproto.at:287: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:287"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76650,7 +76953,7 @@
 $as_echo "$at_srcdir/ofproto.at:292: ovs-ofctl -O OpenFlow11 -vwarn add-groups br0 groups.txt"
 at_fn_check_prepare_trace "ofproto.at:292"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-groups br0 groups.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76665,7 +76968,7 @@
 $as_echo "$at_srcdir/ofproto.at:293: ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0 "
 at_fn_check_prepare_trace "ofproto.at:293"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76680,7 +76983,7 @@
 $as_echo "$at_srcdir/ofproto.at:294: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:294"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76699,7 +77002,7 @@
 $as_echo "$at_srcdir/ofproto.at:299: ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234"
 at_fn_check_prepare_trace "ofproto.at:299"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76714,7 +77017,7 @@
 $as_echo "$at_srcdir/ofproto.at:300: ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0"
 at_fn_check_prepare_trace "ofproto.at:300"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76729,7 +77032,7 @@
 $as_echo "$at_srcdir/ofproto.at:301: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:301"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76747,7 +77050,7 @@
 $as_echo "$at_srcdir/ofproto.at:305: ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234"
 at_fn_check_prepare_trace "ofproto.at:305"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76762,7 +77065,7 @@
 $as_echo "$at_srcdir/ofproto.at:306: ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0"
 at_fn_check_prepare_trace "ofproto.at:306"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76777,7 +77080,7 @@
 $as_echo "$at_srcdir/ofproto.at:307: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:307"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76795,7 +77098,7 @@
 $as_echo "$at_srcdir/ofproto.at:311: ovs-ofctl -O OpenFlow11 -vwarn del-groups br0"
 at_fn_check_prepare_trace "ofproto.at:311"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn del-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76810,7 +77113,7 @@
 $as_echo "$at_srcdir/ofproto.at:312: ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0"
 at_fn_check_prepare_trace "ofproto.at:312"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76825,7 +77128,7 @@
 $as_echo "$at_srcdir/ofproto.at:313: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
 at_fn_check_prepare_trace "ofproto.at:313"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76844,7 +77147,7 @@
 $as_echo "$at_srcdir/ofproto.at:318: ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=0xfffffff0"
 at_fn_check_prepare_trace "ofproto.at:318"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=0xfffffff0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: invalid group id 4294967280
@@ -76861,7 +77164,7 @@
 $as_echo "$at_srcdir/ofproto.at:321: check_logs "
 at_fn_check_prepare_trace "ofproto.at:321"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76876,7 +77179,7 @@
 $as_echo "$at_srcdir/ofproto.at:321: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:321"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76891,7 +77194,7 @@
 $as_echo "$at_srcdir/ofproto.at:321: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:321"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76906,13 +77209,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_693
-#AT_START_694
-at_fn_group_banner 694 'ofproto.at:327' \
+#AT_STOP_695
+#AT_START_696
+at_fn_group_banner 696 'ofproto.at:327' \
   "ofproto - add indirect group" "                   " 49
 at_xfail=no
 (
-  $as_echo "694. $at_setup_line: testing $at_desc ..."
+  $as_echo "696. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -76925,7 +77228,7 @@
 $as_echo "$at_srcdir/ofproto.at:328: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:328"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76939,7 +77242,7 @@
 $as_echo "$at_srcdir/ofproto.at:328: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:328"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -76961,7 +77264,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76976,7 +77279,7 @@
 $as_echo "$at_srcdir/ofproto.at:328: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:328"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -76991,7 +77294,7 @@
 $as_echo "$at_srcdir/ofproto.at:328: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:328"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -77023,7 +77326,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -77040,7 +77343,7 @@
 $as_echo "$at_srcdir/ofproto.at:328: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:328"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -77061,7 +77364,7 @@
 $as_echo "$at_srcdir/ofproto.at:334: ovs-ofctl -O OpenFlow11 -vwarn add-group br0 'group_id=1234,type=indirect'"
 at_fn_check_prepare_trace "ofproto.at:334"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-group br0 'group_id=1234,type=indirect'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -77076,7 +77379,7 @@
 $as_echo "$at_srcdir/ofproto.at:335: ovs-ofctl -O OpenFlow11 -vwarn add-group br0 'group_id=1235,type=indirect,bucket=output:10'"
 at_fn_check_prepare_trace "ofproto.at:335"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-group br0 'group_id=1235,type=indirect,bucket=output:10'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -77091,7 +77394,7 @@
 $as_echo "$at_srcdir/ofproto.at:336: ovs-ofctl -O OpenFlow11 -vwarn add-group br0 'group_id=1236,type=indirect,bucket=output:10,bucket=output:11'"
 at_fn_check_prepare_trace "ofproto.at:336"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-group br0 'group_id=1236,type=indirect,bucket=output:10,bucket=output:11'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -77106,7 +77409,7 @@
 $as_echo "$at_srcdir/ofproto.at:337: check_logs "
 at_fn_check_prepare_trace "ofproto.at:337"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -77121,7 +77424,7 @@
 $as_echo "$at_srcdir/ofproto.at:337: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto.at:337"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -77136,7 +77439,7 @@
 $as_echo "$at_srcdir/ofproto.at:337: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto.at:337"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -77151,13 +77454,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_694
-#AT_START_695
-at_fn_group_banner 695 'ofproto.at:343' \
+#AT_STOP_696
+#AT_START_697
+at_fn_group_banner 697 'ofproto.at:343' \
   "ofproto - del group (OpenFlow 1.5)" "             " 49
 at_xfail=no
 (
-  $as_echo "695. $at_setup_line: testing $at_desc ..."
+  $as_echo "697. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -77170,7 +77473,7 @@
 $as_echo "$at_srcdir/ofproto.at:344: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:344"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -77184,7 +77487,7 @@
 $as_echo "$at_srcdir/ofproto.at:344: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:344"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -77206,7 +77509,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -77221,7 +77524,7 @@
 $as_echo "$at_srcdir/ofproto.at:344: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto.at:344"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -77236,7 +77539,7 @@
 $as_echo "$at_srcdir/ofproto.at:344: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto.at:344"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -77268,7 +77571,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -77285,7 +77588,7 @@
 $as_echo "$at_srcdir/ofproto.at:344: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto.at:344"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -77298,241 +77601,244 @@
 
 
 cat >groups.txt <<'_ATEOF'
-group_id=1234,type=select,selection_method=hash,bucket=output:10,bucket=output:11
+group_id=1233,type=select,selection_method=hash,bucket=output:10,bucket=output:11
+group_id=1234,type=select,selection_method=hash,fields(eth_dst,ip_dst,tcp_dst),bucket=output:10,bucket=output:11
 group_id=1235,type=all,bucket=actions=output:12,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:349: ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt"
-at_fn_check_prepare_trace "ofproto.at:349"
+$as_echo "$at_srcdir/ofproto.at:350: ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt"
+at_fn_check_prepare_trace "ofproto.at:350"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:349"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:350"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:350: ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234"
-at_fn_check_prepare_trace "ofproto.at:350"
+$as_echo "$at_srcdir/ofproto.at:351: ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234"
+at_fn_check_prepare_trace "ofproto.at:351"
 ( $at_check_trace; ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:350"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:351"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:351: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:351"
+$as_echo "$at_srcdir/ofproto.at:352: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:352"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_GROUP_DESC reply (OF1.5):
- group_id=1234,type=select,selection_method=hash,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
+ group_id=1234,type=select,selection_method=hash,fields(eth_dst,ip_dst,tcp_dst),bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:351"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:352"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:355: ovs-ofctl -O OpenFlow15 -vwarn del-groups br0 group_id=1234"
-at_fn_check_prepare_trace "ofproto.at:355"
+$as_echo "$at_srcdir/ofproto.at:356: ovs-ofctl -O OpenFlow15 -vwarn del-groups br0 group_id=1234"
+at_fn_check_prepare_trace "ofproto.at:356"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn del-groups br0 group_id=1234
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:355"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:356"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:356: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:356"
+$as_echo "$at_srcdir/ofproto.at:357: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:357"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:356"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:357"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:357: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:357"
+$as_echo "$at_srcdir/ofproto.at:358: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:358"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_GROUP_DESC reply (OF1.5):
  group_id=1235,type=all,bucket=bucket_id:2,actions=output:12,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
+ group_id=1233,type=select,selection_method=hash,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:357"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:358"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:361: ovs-ofctl -O OpenFlow15 -vwarn del-groups br0 group_id=1234"
-at_fn_check_prepare_trace "ofproto.at:361"
+$as_echo "$at_srcdir/ofproto.at:363: ovs-ofctl -O OpenFlow15 -vwarn del-groups br0 group_id=1234"
+at_fn_check_prepare_trace "ofproto.at:363"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn del-groups br0 group_id=1234
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:361"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:363"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:362: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:362"
+$as_echo "$at_srcdir/ofproto.at:364: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:364"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:362"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:364"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:363: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:363"
+$as_echo "$at_srcdir/ofproto.at:365: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:365"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_GROUP_DESC reply (OF1.5):
  group_id=1235,type=all,bucket=bucket_id:2,actions=output:12,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
+ group_id=1233,type=select,selection_method=hash,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:363"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:365"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:367: ovs-ofctl -O OpenFlow15 -vwarn del-groups br0"
-at_fn_check_prepare_trace "ofproto.at:367"
+$as_echo "$at_srcdir/ofproto.at:370: ovs-ofctl -O OpenFlow15 -vwarn del-groups br0"
+at_fn_check_prepare_trace "ofproto.at:370"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn del-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:367"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:370"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:368: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:368"
+$as_echo "$at_srcdir/ofproto.at:371: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:371"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:368"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:371"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:369: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:369"
+$as_echo "$at_srcdir/ofproto.at:372: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:372"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_GROUP_DESC reply (OF1.5):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:369"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:372"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:372: check_logs "
-at_fn_check_prepare_trace "ofproto.at:372"
+$as_echo "$at_srcdir/ofproto.at:375: check_logs "
+at_fn_check_prepare_trace "ofproto.at:375"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:372"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:375"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:372: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:372"
+$as_echo "$at_srcdir/ofproto.at:375: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:375"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:372"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:375"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:372: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:372"
+$as_echo "$at_srcdir/ofproto.at:375: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:375"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:372"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:375"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -77542,13 +77848,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_695
-#AT_START_696
-at_fn_group_banner 696 'ofproto.at:377' \
+#AT_STOP_697
+#AT_START_698
+at_fn_group_banner 698 'ofproto.at:380' \
   "ofproto - del group deletes flows" "              " 49
 at_xfail=no
 (
-  $as_echo "696. $at_setup_line: testing $at_desc ..."
+  $as_echo "698. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -77558,29 +77864,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:378: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:378"
+$as_echo "$at_srcdir/ofproto.at:381: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:381"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:381"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:378: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:378"
+$as_echo "$at_srcdir/ofproto.at:381: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:381"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:381"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -77590,49 +77896,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:378: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:381: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:378"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:381"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:381"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:378: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:378"
+$as_echo "$at_srcdir/ofproto.at:381: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:381"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:381"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:378: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:378"
+$as_echo "$at_srcdir/ofproto.at:381: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:381"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:381"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -77644,14 +77950,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:378: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:381: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:378"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:381"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -77659,12 +77965,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:381"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -77673,15 +77979,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:378: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:378"
+$as_echo "$at_srcdir/ofproto.at:381: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:381"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:381"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -77694,15 +78000,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:383: ovs-ofctl -O OpenFlow11 -vwarn add-groups br0 groups.txt"
-at_fn_check_prepare_trace "ofproto.at:383"
+$as_echo "$at_srcdir/ofproto.at:386: ovs-ofctl -O OpenFlow11 -vwarn add-groups br0 groups.txt"
+at_fn_check_prepare_trace "ofproto.at:386"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-groups br0 groups.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:383"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:386"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -77710,181 +78016,181 @@
 
 cat >flows.txt <<'_ATEOF'
 tcp actions=group:1234
-udp actions=group:1235
+table=2 udp actions=group:1235
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:388: ovs-ofctl -O OpenFlow11 -vwarn add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto.at:388"
+$as_echo "$at_srcdir/ofproto.at:391: ovs-ofctl -O OpenFlow11 -vwarn add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto.at:391"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:388"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:391"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:389: ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:389"
+$as_echo "$at_srcdir/ofproto.at:392: ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:392"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo " tcp actions=group:1234
- udp actions=group:1235
+echo >>"$at_stdout"; $as_echo " table=2, udp actions=group:1235
+ tcp actions=group:1234
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:389"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:392"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:395: ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234"
-at_fn_check_prepare_trace "ofproto.at:395"
+$as_echo "$at_srcdir/ofproto.at:398: ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234"
+at_fn_check_prepare_trace "ofproto.at:398"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:395"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:398"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:396: ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:396"
+$as_echo "$at_srcdir/ofproto.at:399: ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:399"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo " udp actions=group:1235
+echo >>"$at_stdout"; $as_echo " table=2, udp actions=group:1235
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:396"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:399"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:401: ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234"
-at_fn_check_prepare_trace "ofproto.at:401"
+$as_echo "$at_srcdir/ofproto.at:404: ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234"
+at_fn_check_prepare_trace "ofproto.at:404"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:401"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:404"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:402: ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:402"
+$as_echo "$at_srcdir/ofproto.at:405: ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:405"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo " udp actions=group:1235
+echo >>"$at_stdout"; $as_echo " table=2, udp actions=group:1235
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:402"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:405"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:407: ovs-ofctl -O OpenFlow11 -vwarn del-groups br0"
-at_fn_check_prepare_trace "ofproto.at:407"
+$as_echo "$at_srcdir/ofproto.at:410: ovs-ofctl -O OpenFlow11 -vwarn del-groups br0"
+at_fn_check_prepare_trace "ofproto.at:410"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn del-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:410"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:408: ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:408"
+$as_echo "$at_srcdir/ofproto.at:411: ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:411"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:408"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:411"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:412: check_logs "
-at_fn_check_prepare_trace "ofproto.at:412"
+$as_echo "$at_srcdir/ofproto.at:415: check_logs "
+at_fn_check_prepare_trace "ofproto.at:415"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:412"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:415"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:412: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:412"
+$as_echo "$at_srcdir/ofproto.at:415: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:415"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:412"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:415"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:412: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:412"
+$as_echo "$at_srcdir/ofproto.at:415: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:415"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:412"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:415"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -77894,13 +78200,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_696
-#AT_START_697
-at_fn_group_banner 697 'ofproto.at:418' \
+#AT_STOP_698
+#AT_START_699
+at_fn_group_banner 699 'ofproto.at:421' \
   "ofproto - insert buckets" "                       " 49
 at_xfail=no
 (
-  $as_echo "697. $at_setup_line: testing $at_desc ..."
+  $as_echo "699. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -77910,29 +78216,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:419: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:419"
+$as_echo "$at_srcdir/ofproto.at:422: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:422"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:422"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:419: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:419"
+$as_echo "$at_srcdir/ofproto.at:422: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:422"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:422"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -77942,49 +78248,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:419: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:422: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:419"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:422"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:422"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:419: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:419"
+$as_echo "$at_srcdir/ofproto.at:422: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:422"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:422"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:419: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:419"
+$as_echo "$at_srcdir/ofproto.at:422: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:422"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:422"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -77996,14 +78302,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:419: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:422: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:419"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:422"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -78011,12 +78317,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:422"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -78025,60 +78331,111 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:419: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:419"
+$as_echo "$at_srcdir/ofproto.at:422: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:422"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:422"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
+# Add group with no buckets.
 cat >groups.txt <<'_ATEOF'
-group_id=1234,type=all,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11
+group_id=1234,type=all
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:423: ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt"
-at_fn_check_prepare_trace "ofproto.at:423"
+$as_echo "$at_srcdir/ofproto.at:427: ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt"
+at_fn_check_prepare_trace "ofproto.at:427"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:427"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/ofproto.at:428: ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234"
+at_fn_check_prepare_trace "ofproto.at:428"
+( $at_check_trace; ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:428"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/ofproto.at:429: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:429"
+( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "OFPST_GROUP_DESC reply (OF1.5):
+ group_id=1234,type=all
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:429"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+# Add two buckets, using "last".
+{ set +x
+$as_echo "$at_srcdir/ofproto.at:435: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11"
+at_fn_check_prepare_trace "ofproto.at:435"
+( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:423"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:435"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:424: ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234"
-at_fn_check_prepare_trace "ofproto.at:424"
+$as_echo "$at_srcdir/ofproto.at:436: ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234"
+at_fn_check_prepare_trace "ofproto.at:436"
 ( $at_check_trace; ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:424"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:436"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:425: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:425"
+$as_echo "$at_srcdir/ofproto.at:437: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:437"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -78086,47 +78443,129 @@
  group_id=1234,type=all,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:425"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:437"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
+
+# Start over again, then add two buckets using "first".
 { set +x
-$as_echo "$at_srcdir/ofproto.at:429: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=first,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1"
-at_fn_check_prepare_trace "ofproto.at:429"
+$as_echo "$at_srcdir/ofproto.at:443: ovs-ofctl -O OpenFlow15 --strict del-groups br0 group_id=1234"
+at_fn_check_prepare_trace "ofproto.at:443"
+( $at_check_trace; ovs-ofctl -O OpenFlow15 --strict del-groups br0 group_id=1234
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:443"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/ofproto.at:444: ovs-ofctl -O OpenFlow15 -vwarn add-group br0 group_id=1234,type=all"
+at_fn_check_prepare_trace "ofproto.at:444"
+( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn add-group br0 group_id=1234,type=all
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:444"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/ofproto.at:445: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=first,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11"
+at_fn_check_prepare_trace "ofproto.at:445"
+( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=first,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:445"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/ofproto.at:446: ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234"
+at_fn_check_prepare_trace "ofproto.at:446"
+( $at_check_trace; ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:446"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/ofproto.at:447: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:447"
+( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "OFPST_GROUP_DESC reply (OF1.5):
+ group_id=1234,type=all,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:447"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+# Add two more buckets before the existing ones.
+{ set +x
+$as_echo "$at_srcdir/ofproto.at:453: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=first,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1"
+at_fn_check_prepare_trace "ofproto.at:453"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=first,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:429"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:453"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:430: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:430"
+$as_echo "$at_srcdir/ofproto.at:454: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:454"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:430"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:454"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:431: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:431"
+$as_echo "$at_srcdir/ofproto.at:455: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:455"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -78134,47 +78573,49 @@
  group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:431"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:455"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
+
+# Add another bucket at the end.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:435: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15"
-at_fn_check_prepare_trace "ofproto.at:435"
+$as_echo "$at_srcdir/ofproto.at:461: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15"
+at_fn_check_prepare_trace "ofproto.at:461"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:461"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:436: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:436"
+$as_echo "$at_srcdir/ofproto.at:462: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:462"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:436"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:462"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:437: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:437"
+$as_echo "$at_srcdir/ofproto.at:463: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:463"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -78182,47 +78623,85 @@
  group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:437"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:463"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+# Verify that duplicate bucket IDs are rejected.
+{ set +x
+$as_echo "$at_srcdir/ofproto.at:469: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15"
+at_fn_check_prepare_trace "ofproto.at:469"
+( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:469"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/ofproto.at:470: sed 's/ (xid=0x[0-9a-fA-F]*)//' stderr | sed '/truncated/,\$d'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:470"
+( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stderr | sed '/truncated/,$d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "OFPT_ERROR (OF1.5): OFPGMFC_BUCKET_EXISTS
+OFPT_GROUP_MOD (OF1.5):
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:470"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
+
+
+# Add another bucket just before bucket 15.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:441: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=15"
-at_fn_check_prepare_trace "ofproto.at:441"
+$as_echo "$at_srcdir/ofproto.at:477: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=15"
+at_fn_check_prepare_trace "ofproto.at:477"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=15
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:441"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:477"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:442: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:442"
+$as_echo "$at_srcdir/ofproto.at:478: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:478"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:442"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:478"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:443: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:443"
+$as_echo "$at_srcdir/ofproto.at:479: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:479"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -78230,51 +78709,54 @@
  group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:443"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:479"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
+
+# Add two more buckets just before bucket 11,
+# getting the command from a file.
 cat >buckets.txt <<'_ATEOF'
 group_id=1234,command_bucket_id=11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:450: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 - < buckets.txt"
-at_fn_check_prepare_trace "ofproto.at:450"
+$as_echo "$at_srcdir/ofproto.at:489: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 - < buckets.txt"
+at_fn_check_prepare_trace "ofproto.at:489"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 - < buckets.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:450"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:489"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:451: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:451"
+$as_echo "$at_srcdir/ofproto.at:490: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:490"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:451"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:490"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:452: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:452"
+$as_echo "$at_srcdir/ofproto.at:491: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:491"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -78282,47 +78764,49 @@
  group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:452"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:491"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
+
+# Add yet two more buckets.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:456: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=15,bucket=bucket_id:20,actions=output:20,bucket=bucket_id:21,actions=output:21"
-at_fn_check_prepare_trace "ofproto.at:456"
+$as_echo "$at_srcdir/ofproto.at:497: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=15,bucket=bucket_id:20,actions=output:20,bucket=bucket_id:21,actions=output:21"
+at_fn_check_prepare_trace "ofproto.at:497"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=15,bucket=bucket_id:20,actions=output:20,bucket=bucket_id:21,actions=output:21
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:456"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:497"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:457: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:457"
+$as_echo "$at_srcdir/ofproto.at:498: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:498"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:457"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:498"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:458: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:458"
+$as_echo "$at_srcdir/ofproto.at:499: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:499"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -78330,7 +78814,7 @@
  group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15,bucket=bucket_id:20,actions=output:20,bucket=bucket_id:21,actions=output:21
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:458"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:499"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -78339,79 +78823,79 @@
 
 # Negative tests.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:464: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=0xffffff01,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1"
-at_fn_check_prepare_trace "ofproto.at:464"
+$as_echo "$at_srcdir/ofproto.at:505: ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=0xffffff01,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1"
+at_fn_check_prepare_trace "ofproto.at:505"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=0xffffff01,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: invalid command bucket id 4294967041
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:464"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:505"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:467: ovs-ofctl -O OpenFlow11 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=first,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1"
-at_fn_check_prepare_trace "ofproto.at:467"
+$as_echo "$at_srcdir/ofproto.at:508: ovs-ofctl -O OpenFlow11 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=first,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1"
+at_fn_check_prepare_trace "ofproto.at:508"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=first,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: insert-bucket needs OpenFlow 1.5 or later ('-O OpenFlow15')
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:467"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:508"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:470: check_logs "
-at_fn_check_prepare_trace "ofproto.at:470"
+$as_echo "$at_srcdir/ofproto.at:511: check_logs "
+at_fn_check_prepare_trace "ofproto.at:511"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:470"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:511"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:470: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:470"
+$as_echo "$at_srcdir/ofproto.at:511: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:511"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:470"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:511"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:470: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:470"
+$as_echo "$at_srcdir/ofproto.at:511: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:511"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:470"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:511"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -78421,13 +78905,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_697
-#AT_START_698
-at_fn_group_banner 698 'ofproto.at:476' \
+#AT_STOP_699
+#AT_START_700
+at_fn_group_banner 700 'ofproto.at:517' \
   "ofproto - remove buckets" "                       " 49
 at_xfail=no
 (
-  $as_echo "698. $at_setup_line: testing $at_desc ..."
+  $as_echo "700. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -78437,29 +78921,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:477: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:477"
+$as_echo "$at_srcdir/ofproto.at:518: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:518"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:477"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:518"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:477: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:477"
+$as_echo "$at_srcdir/ofproto.at:518: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:518"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:477"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:518"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -78469,49 +78953,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:477: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:518: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:477"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:518"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:477"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:518"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:477: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:477"
+$as_echo "$at_srcdir/ofproto.at:518: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:518"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:477"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:518"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:477: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:477"
+$as_echo "$at_srcdir/ofproto.at:518: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:518"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:477"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:518"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -78523,14 +79007,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:477: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:518: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:477"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:518"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -78538,12 +79022,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:477"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:518"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -78552,15 +79036,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:477: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:477"
+$as_echo "$at_srcdir/ofproto.at:518: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:518"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:477"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:518"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -78572,40 +79056,40 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:481: ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt"
-at_fn_check_prepare_trace "ofproto.at:481"
+$as_echo "$at_srcdir/ofproto.at:522: ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt"
+at_fn_check_prepare_trace "ofproto.at:522"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:481"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:522"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:482: ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234"
-at_fn_check_prepare_trace "ofproto.at:482"
+$as_echo "$at_srcdir/ofproto.at:523: ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234"
+at_fn_check_prepare_trace "ofproto.at:523"
 ( $at_check_trace; ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:482"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:523"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:483: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:483"
+$as_echo "$at_srcdir/ofproto.at:524: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:524"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -78613,47 +79097,47 @@
  group_id=1234,type=all,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15,bucket=bucket_id:16,actions=output:16
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:483"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:524"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:487: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=first"
-at_fn_check_prepare_trace "ofproto.at:487"
+$as_echo "$at_srcdir/ofproto.at:528: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=first"
+at_fn_check_prepare_trace "ofproto.at:528"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=first
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:487"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:528"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:488: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:488"
+$as_echo "$at_srcdir/ofproto.at:529: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:529"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:488"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:529"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:489: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:489"
+$as_echo "$at_srcdir/ofproto.at:530: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:530"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -78661,47 +79145,47 @@
  group_id=1234,type=all,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15,bucket=bucket_id:16,actions=output:16
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:489"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:530"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:493: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=last"
-at_fn_check_prepare_trace "ofproto.at:493"
+$as_echo "$at_srcdir/ofproto.at:534: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=last"
+at_fn_check_prepare_trace "ofproto.at:534"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=last
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:493"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:534"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:494: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:494"
+$as_echo "$at_srcdir/ofproto.at:535: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:535"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:494"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:535"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:495: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:495"
+$as_echo "$at_srcdir/ofproto.at:536: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:536"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -78709,47 +79193,47 @@
  group_id=1234,type=all,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:495"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:536"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:499: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=13"
-at_fn_check_prepare_trace "ofproto.at:499"
+$as_echo "$at_srcdir/ofproto.at:540: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=13"
+at_fn_check_prepare_trace "ofproto.at:540"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=13
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:499"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:540"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:500: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:500"
+$as_echo "$at_srcdir/ofproto.at:541: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:541"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:500"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:541"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:501: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:501"
+$as_echo "$at_srcdir/ofproto.at:542: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:542"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -78757,7 +79241,7 @@
  group_id=1234,type=all,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:501"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:542"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -78768,40 +79252,40 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:508: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 - < buckets.txt"
-at_fn_check_prepare_trace "ofproto.at:508"
+$as_echo "$at_srcdir/ofproto.at:549: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 - < buckets.txt"
+at_fn_check_prepare_trace "ofproto.at:549"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 - < buckets.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:508"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:549"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:509: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:509"
+$as_echo "$at_srcdir/ofproto.at:550: ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:550"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:509"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:550"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:510: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:510"
+$as_echo "$at_srcdir/ofproto.at:551: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:551"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -78809,77 +79293,77 @@
  group_id=1234,type=all
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:510"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:551"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:514: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=first"
-at_fn_check_prepare_trace "ofproto.at:514"
+$as_echo "$at_srcdir/ofproto.at:555: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=first"
+at_fn_check_prepare_trace "ofproto.at:555"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=first
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:514"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:555"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:515: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=last"
-at_fn_check_prepare_trace "ofproto.at:515"
+$as_echo "$at_srcdir/ofproto.at:556: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=last"
+at_fn_check_prepare_trace "ofproto.at:556"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=last
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:515"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:556"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:516: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=all"
-at_fn_check_prepare_trace "ofproto.at:516"
+$as_echo "$at_srcdir/ofproto.at:557: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=all"
+at_fn_check_prepare_trace "ofproto.at:557"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=all
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:516"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:557"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:517: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=1"
-at_fn_check_prepare_trace "ofproto.at:517"
+$as_echo "$at_srcdir/ofproto.at:558: ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=1"
+at_fn_check_prepare_trace "ofproto.at:558"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:517"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:558"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:518: cat stderr | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:518"
+$as_echo "$at_srcdir/ofproto.at:559: cat stderr | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:559"
 ( $at_check_trace; cat stderr | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -78888,7 +79372,7 @@
  REMOVE_BUCKET command_bucket_id:1,group_id=1234
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:518"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:559"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -78896,62 +79380,62 @@
 
 # Negative test.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:524: ovs-ofctl -O OpenFlow11 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=last"
-at_fn_check_prepare_trace "ofproto.at:524"
+$as_echo "$at_srcdir/ofproto.at:565: ovs-ofctl -O OpenFlow11 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=last"
+at_fn_check_prepare_trace "ofproto.at:565"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=last
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: remove-bucket needs OpenFlow 1.5 or later ('-O OpenFlow15')
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:524"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:565"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:527: check_logs "
-at_fn_check_prepare_trace "ofproto.at:527"
+$as_echo "$at_srcdir/ofproto.at:568: check_logs "
+at_fn_check_prepare_trace "ofproto.at:568"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:527"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:568"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:527: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:527"
+$as_echo "$at_srcdir/ofproto.at:568: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:568"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:527"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:568"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:527: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:527"
+$as_echo "$at_srcdir/ofproto.at:568: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:568"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:527"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:568"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -78961,13 +79445,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_698
-#AT_START_699
-at_fn_group_banner 699 'ofproto.at:532' \
+#AT_STOP_700
+#AT_START_701
+at_fn_group_banner 701 'ofproto.at:573' \
   "ofproto - flow mod checks group availability" "   " 49
 at_xfail=no
 (
-  $as_echo "699. $at_setup_line: testing $at_desc ..."
+  $as_echo "701. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -78977,29 +79461,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:533: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:533"
+$as_echo "$at_srcdir/ofproto.at:574: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:574"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:533"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:533: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:533"
+$as_echo "$at_srcdir/ofproto.at:574: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:574"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:533"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -79009,49 +79493,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:533: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:574: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:533"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:574"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:533"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:533: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:533"
+$as_echo "$at_srcdir/ofproto.at:574: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:574"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:533"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:533: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:533"
+$as_echo "$at_srcdir/ofproto.at:574: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:574"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:533"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -79063,14 +79547,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:533: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:574: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:533"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:574"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -79078,12 +79562,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:533"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79092,15 +79576,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:533: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:533"
+$as_echo "$at_srcdir/ofproto.at:574: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:574"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:533"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79108,15 +79592,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:534: ovs-ofctl -O OpenFlow11 -vwarn add-group br0 group_id=1234,type=all,bucket=output:10"
-at_fn_check_prepare_trace "ofproto.at:534"
+$as_echo "$at_srcdir/ofproto.at:575: ovs-ofctl -O OpenFlow11 -vwarn add-group br0 group_id=1234,type=all,bucket=output:10"
+at_fn_check_prepare_trace "ofproto.at:575"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-group br0 group_id=1234,type=all,bucket=output:10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:534"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:575"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79128,30 +79612,30 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:539: ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=group:1234'"
-at_fn_check_prepare_trace "ofproto.at:539"
+$as_echo "$at_srcdir/ofproto.at:580: ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=group:1234'"
+at_fn_check_prepare_trace "ofproto.at:580"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=group:1234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:539"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:580"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:540: ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=group:1235'"
-at_fn_check_prepare_trace "ofproto.at:540"
+$as_echo "$at_srcdir/ofproto.at:581: ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=group:1235'"
+at_fn_check_prepare_trace "ofproto.at:581"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=group:1235'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:540"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:581"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79167,12 +79651,12 @@
 #
 # This 'sed' command captures the error message but drops details.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:550: sed '/truncated/d
+$as_echo "$at_srcdir/ofproto.at:591: sed '/truncated/d
 /^000000.0/d' stderr | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:550"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:591"
 ( $at_check_trace; sed '/truncated/d
 /^000000.0/d' stderr | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -79180,52 +79664,52 @@
 OFPT_FLOW_MOD (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:550"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:591"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:555: check_logs "
-at_fn_check_prepare_trace "ofproto.at:555"
+$as_echo "$at_srcdir/ofproto.at:596: check_logs "
+at_fn_check_prepare_trace "ofproto.at:596"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:555"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:596"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:555: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:555"
+$as_echo "$at_srcdir/ofproto.at:596: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:596"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:555"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:596"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:555: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:555"
+$as_echo "$at_srcdir/ofproto.at:596: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:596"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:555"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:596"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79235,13 +79719,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_699
-#AT_START_700
-at_fn_group_banner 700 'ofproto.at:560' \
+#AT_STOP_701
+#AT_START_702
+at_fn_group_banner 702 'ofproto.at:601' \
   "ofproto - group description" "                    " 49
 at_xfail=no
 (
-  $as_echo "700. $at_setup_line: testing $at_desc ..."
+  $as_echo "702. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -79251,29 +79735,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:561: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:561"
+$as_echo "$at_srcdir/ofproto.at:602: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:602"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:602"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:561: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:561"
+$as_echo "$at_srcdir/ofproto.at:602: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:602"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:602"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -79283,49 +79767,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:561: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:602: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:602"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:602"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:561: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:561"
+$as_echo "$at_srcdir/ofproto.at:602: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:602"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:602"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:561: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:561"
+$as_echo "$at_srcdir/ofproto.at:602: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:602"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:602"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -79337,14 +79821,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:561: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:602: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:602"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -79352,12 +79836,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:602"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79366,15 +79850,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:561: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:561"
+$as_echo "$at_srcdir/ofproto.at:602: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:602"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:602"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79382,40 +79866,40 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:562: ovs-ofctl -O OpenFlow11 -vwarn add-group br0 group_id=1234,type=all,bucket=output:10"
-at_fn_check_prepare_trace "ofproto.at:562"
+$as_echo "$at_srcdir/ofproto.at:603: ovs-ofctl -O OpenFlow11 -vwarn add-group br0 group_id=1234,type=all,bucket=output:10"
+at_fn_check_prepare_trace "ofproto.at:603"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-group br0 group_id=1234,type=all,bucket=output:10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:562"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:603"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:563: ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:563"
+$as_echo "$at_srcdir/ofproto.at:604: ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:604"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:563"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:604"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:564: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:564"
+$as_echo "$at_srcdir/ofproto.at:605: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:605"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -79423,52 +79907,52 @@
  group_id=1234,type=all,bucket=actions=output:10
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:564"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:605"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:568: check_logs "
-at_fn_check_prepare_trace "ofproto.at:568"
+$as_echo "$at_srcdir/ofproto.at:609: check_logs "
+at_fn_check_prepare_trace "ofproto.at:609"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:568"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:609"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:568: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:568"
+$as_echo "$at_srcdir/ofproto.at:609: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:609"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:568"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:609"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:568: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:568"
+$as_echo "$at_srcdir/ofproto.at:609: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:609"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:568"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:609"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79478,13 +79962,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_700
-#AT_START_701
-at_fn_group_banner 701 'ofproto.at:573' \
+#AT_STOP_702
+#AT_START_703
+at_fn_group_banner 703 'ofproto.at:614' \
   "ofproto - group description" "                    " 49
 at_xfail=no
 (
-  $as_echo "701. $at_setup_line: testing $at_desc ..."
+  $as_echo "703. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -79494,29 +79978,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:574: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:574"
+$as_echo "$at_srcdir/ofproto.at:615: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:615"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:615"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:574: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:574"
+$as_echo "$at_srcdir/ofproto.at:615: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:615"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:615"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -79526,49 +80010,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:574: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:615: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:574"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:615"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:615"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:574: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:574"
+$as_echo "$at_srcdir/ofproto.at:615: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:615"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:615"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:574: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:574"
+$as_echo "$at_srcdir/ofproto.at:615: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:615"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:615"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -79580,14 +80064,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:574: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:615: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:574"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:615"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -79595,12 +80079,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:615"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79609,15 +80093,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:574: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:574"
+$as_echo "$at_srcdir/ofproto.at:615: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:615"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:615"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79625,40 +80109,40 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:575: ovs-ofctl -O OpenFlow11 -vwarn add-group br0 group_id=1234,type=all,bucket=output:10"
-at_fn_check_prepare_trace "ofproto.at:575"
+$as_echo "$at_srcdir/ofproto.at:616: ovs-ofctl -O OpenFlow11 -vwarn add-group br0 group_id=1234,type=all,bucket=output:10"
+at_fn_check_prepare_trace "ofproto.at:616"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-group br0 group_id=1234,type=all,bucket=output:10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:575"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:616"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:576: ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0"
-at_fn_check_prepare_trace "ofproto.at:576"
+$as_echo "$at_srcdir/ofproto.at:617: ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0"
+at_fn_check_prepare_trace "ofproto.at:617"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:576"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:617"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:577: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:577"
+$as_echo "$at_srcdir/ofproto.at:618: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:618"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -79666,52 +80150,52 @@
  group_id=1234,type=all,bucket=actions=output:10
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:618"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:581: check_logs "
-at_fn_check_prepare_trace "ofproto.at:581"
+$as_echo "$at_srcdir/ofproto.at:622: check_logs "
+at_fn_check_prepare_trace "ofproto.at:622"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:581"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:622"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:581: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:581"
+$as_echo "$at_srcdir/ofproto.at:622: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:622"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:581"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:622"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:581: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:581"
+$as_echo "$at_srcdir/ofproto.at:622: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:622"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:581"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:622"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79721,13 +80205,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_701
-#AT_START_702
-at_fn_group_banner 702 'ofproto.at:586' \
+#AT_STOP_703
+#AT_START_704
+at_fn_group_banner 704 'ofproto.at:627' \
   "ofproto - group features" "                       " 49
 at_xfail=no
 (
-  $as_echo "702. $at_setup_line: testing $at_desc ..."
+  $as_echo "704. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -79737,29 +80221,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:587: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:587"
+$as_echo "$at_srcdir/ofproto.at:628: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:628"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:628"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:587: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:587"
+$as_echo "$at_srcdir/ofproto.at:628: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:628"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:628"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -79769,49 +80253,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:587: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:628: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:587"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:628"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:628"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:587: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:587"
+$as_echo "$at_srcdir/ofproto.at:628: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:628"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:628"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:587: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:587"
+$as_echo "$at_srcdir/ofproto.at:628: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:628"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:628"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -79823,14 +80307,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:587: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:628: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:587"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:628"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -79838,12 +80322,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:628"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79852,15 +80336,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:587: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:587"
+$as_echo "$at_srcdir/ofproto.at:628: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:628"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:628"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79868,25 +80352,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:588: ovs-ofctl -O OpenFlow12 -vwarn dump-group-features br0"
-at_fn_check_prepare_trace "ofproto.at:588"
+$as_echo "$at_srcdir/ofproto.at:629: ovs-ofctl -O OpenFlow12 -vwarn dump-group-features br0"
+at_fn_check_prepare_trace "ofproto.at:629"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 -vwarn dump-group-features br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:588"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:629"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:589: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:589"
+$as_echo "$at_srcdir/ofproto.at:630: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:630"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -79908,52 +80392,52 @@
        actions: output group set_field strip_vlan push_vlan mod_nw_ttl dec_ttl set_mpls_ttl dec_mpls_ttl push_mpls pop_mpls set_queue
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:589"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:630"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:607: check_logs "
-at_fn_check_prepare_trace "ofproto.at:607"
+$as_echo "$at_srcdir/ofproto.at:648: check_logs "
+at_fn_check_prepare_trace "ofproto.at:648"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:607"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:648"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:607: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:607"
+$as_echo "$at_srcdir/ofproto.at:648: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:648"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:607"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:648"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:607: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:607"
+$as_echo "$at_srcdir/ofproto.at:648: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:648"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:607"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:648"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -79963,13 +80447,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_702
-#AT_START_703
-at_fn_group_banner 703 'ofproto.at:612' \
+#AT_STOP_704
+#AT_START_705
+at_fn_group_banner 705 'ofproto.at:653' \
   "ofproto - group stats (OpenFlow 1.1)" "           " 49
 at_xfail=no
 (
-  $as_echo "703. $at_setup_line: testing $at_desc ..."
+  $as_echo "705. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -79979,29 +80463,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:613: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:613"
+$as_echo "$at_srcdir/ofproto.at:654: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:654"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:613"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:654"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:613: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:613"
+$as_echo "$at_srcdir/ofproto.at:654: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:654"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:613"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:654"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -80011,49 +80495,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:613: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:654: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:613"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:654"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:613"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:654"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:613: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:613"
+$as_echo "$at_srcdir/ofproto.at:654: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:654"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:613"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:654"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:613: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:613"
+$as_echo "$at_srcdir/ofproto.at:654: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:654"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:613"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:654"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -80065,14 +80549,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:613: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:654: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:613"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:654"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -80080,12 +80564,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:613"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:654"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -80094,15 +80578,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:613: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:613"
+$as_echo "$at_srcdir/ofproto.at:654: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:654"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:613"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:654"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -80115,55 +80599,55 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:618: ovs-ofctl -O OpenFlow11 -vwarn add-groups br0 groups.txt"
-at_fn_check_prepare_trace "ofproto.at:618"
+$as_echo "$at_srcdir/ofproto.at:659: ovs-ofctl -O OpenFlow11 -vwarn add-groups br0 groups.txt"
+at_fn_check_prepare_trace "ofproto.at:659"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-groups br0 groups.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:618"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:659"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:619: ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=group:1234'"
-at_fn_check_prepare_trace "ofproto.at:619"
+$as_echo "$at_srcdir/ofproto.at:660: ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=group:1234'"
+at_fn_check_prepare_trace "ofproto.at:660"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=group:1234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:619"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:660"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:620: ovs-ofctl -O OpenFlow11 -vwarn dump-group-stats br0 group_id=1234"
-at_fn_check_prepare_trace "ofproto.at:620"
+$as_echo "$at_srcdir/ofproto.at:661: ovs-ofctl -O OpenFlow11 -vwarn dump-group-stats br0 group_id=1234"
+at_fn_check_prepare_trace "ofproto.at:661"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn dump-group-stats br0 group_id=1234
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:620"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:661"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:621: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:621"
+$as_echo "$at_srcdir/ofproto.at:662: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:662"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -80171,32 +80655,32 @@
 OFPST_GROUP reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:621"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:662"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:625: ovs-ofctl -O OpenFlow11 -vwarn dump-group-stats br0"
-at_fn_check_prepare_trace "ofproto.at:625"
+$as_echo "$at_srcdir/ofproto.at:666: ovs-ofctl -O OpenFlow11 -vwarn dump-group-stats br0"
+at_fn_check_prepare_trace "ofproto.at:666"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn dump-group-stats br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:625"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:666"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:626: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:626"
+$as_echo "$at_srcdir/ofproto.at:667: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:667"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -80205,52 +80689,52 @@
 OFPST_GROUP reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:626"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:667"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:631: check_logs "
-at_fn_check_prepare_trace "ofproto.at:631"
+$as_echo "$at_srcdir/ofproto.at:672: check_logs "
+at_fn_check_prepare_trace "ofproto.at:672"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:631"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:672"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:631: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:631"
+$as_echo "$at_srcdir/ofproto.at:672: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:672"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:631"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:672"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:631: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:631"
+$as_echo "$at_srcdir/ofproto.at:672: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:672"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:631"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:672"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -80260,13 +80744,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_703
-#AT_START_704
-at_fn_group_banner 704 'ofproto.at:636' \
+#AT_STOP_705
+#AT_START_706
+at_fn_group_banner 706 'ofproto.at:677' \
   "ofproto - group stats (OpenFlow 1.3)" "           " 49
 at_xfail=no
 (
-  $as_echo "704. $at_setup_line: testing $at_desc ..."
+  $as_echo "706. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -80276,29 +80760,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:637: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:637"
+$as_echo "$at_srcdir/ofproto.at:678: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:678"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:678"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:637: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:637"
+$as_echo "$at_srcdir/ofproto.at:678: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:678"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:678"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -80308,49 +80792,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:637: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:678: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:637"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:678"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:678"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:637: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:637"
+$as_echo "$at_srcdir/ofproto.at:678: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:678"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:678"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:637: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:637"
+$as_echo "$at_srcdir/ofproto.at:678: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:678"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:678"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -80362,14 +80846,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:637: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:678: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:637"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:678"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -80377,12 +80861,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:678"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -80391,15 +80875,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:637: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:637"
+$as_echo "$at_srcdir/ofproto.at:678: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:678"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:678"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -80412,55 +80896,55 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:642: ovs-ofctl -O OpenFlow13 -vwarn add-groups br0 groups.txt"
-at_fn_check_prepare_trace "ofproto.at:642"
+$as_echo "$at_srcdir/ofproto.at:683: ovs-ofctl -O OpenFlow13 -vwarn add-groups br0 groups.txt"
+at_fn_check_prepare_trace "ofproto.at:683"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 -vwarn add-groups br0 groups.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:683"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:643: ovs-ofctl -O OpenFlow13 -vwarn add-flow br0 'tcp actions=group:1234'"
-at_fn_check_prepare_trace "ofproto.at:643"
+$as_echo "$at_srcdir/ofproto.at:684: ovs-ofctl -O OpenFlow13 -vwarn add-flow br0 'tcp actions=group:1234'"
+at_fn_check_prepare_trace "ofproto.at:684"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 -vwarn add-flow br0 'tcp actions=group:1234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:643"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:684"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:644: ovs-ofctl -O OpenFlow13 -vwarn dump-group-stats br0 group_id=1234"
-at_fn_check_prepare_trace "ofproto.at:644"
+$as_echo "$at_srcdir/ofproto.at:685: ovs-ofctl -O OpenFlow13 -vwarn dump-group-stats br0 group_id=1234"
+at_fn_check_prepare_trace "ofproto.at:685"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 -vwarn dump-group-stats br0 group_id=1234
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:644"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:685"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:645: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:645"
+$as_echo "$at_srcdir/ofproto.at:686: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:686"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -80468,32 +80952,32 @@
 OFPST_GROUP reply (OF1.3):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:645"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:686"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:649: ovs-ofctl -O OpenFlow13 -vwarn dump-group-stats br0"
-at_fn_check_prepare_trace "ofproto.at:649"
+$as_echo "$at_srcdir/ofproto.at:690: ovs-ofctl -O OpenFlow13 -vwarn dump-group-stats br0"
+at_fn_check_prepare_trace "ofproto.at:690"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 -vwarn dump-group-stats br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:649"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:690"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:650: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:650"
+$as_echo "$at_srcdir/ofproto.at:691: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:691"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -80502,52 +80986,52 @@
 OFPST_GROUP reply (OF1.3):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:650"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:691"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:655: check_logs "
-at_fn_check_prepare_trace "ofproto.at:655"
+$as_echo "$at_srcdir/ofproto.at:696: check_logs "
+at_fn_check_prepare_trace "ofproto.at:696"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:655"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:696"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:655: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:655"
+$as_echo "$at_srcdir/ofproto.at:696: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:696"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:655"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:696"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:655: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:655"
+$as_echo "$at_srcdir/ofproto.at:696: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:696"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:655"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:696"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -80557,13 +81041,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_704
-#AT_START_705
-at_fn_group_banner 705 'ofproto.at:660' \
+#AT_STOP_706
+#AT_START_707
+at_fn_group_banner 707 'ofproto.at:701' \
   "ofproto - group stats (OpenFlow 1.5)" "           " 49
 at_xfail=no
 (
-  $as_echo "705. $at_setup_line: testing $at_desc ..."
+  $as_echo "707. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -80573,29 +81057,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:661: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:661"
+$as_echo "$at_srcdir/ofproto.at:702: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:702"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:702"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:661: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:661"
+$as_echo "$at_srcdir/ofproto.at:702: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:702"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:702"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -80605,49 +81089,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:661: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:702: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:661"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:702"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:702"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:661: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:661"
+$as_echo "$at_srcdir/ofproto.at:702: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:702"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:702"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:661: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:661"
+$as_echo "$at_srcdir/ofproto.at:702: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:702"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:702"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -80659,14 +81143,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:661: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:702: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:661"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:702"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -80674,12 +81158,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:702"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -80688,15 +81172,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:661: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:661"
+$as_echo "$at_srcdir/ofproto.at:702: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:702"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:702"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -80709,55 +81193,55 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:666: ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt"
-at_fn_check_prepare_trace "ofproto.at:666"
+$as_echo "$at_srcdir/ofproto.at:707: ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt"
+at_fn_check_prepare_trace "ofproto.at:707"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:666"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:707"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:667: ovs-ofctl -O OpenFlow15 -vwarn add-flow br0 'tcp actions=group:1234'"
-at_fn_check_prepare_trace "ofproto.at:667"
+$as_echo "$at_srcdir/ofproto.at:708: ovs-ofctl -O OpenFlow15 -vwarn add-flow br0 'tcp actions=group:1234'"
+at_fn_check_prepare_trace "ofproto.at:708"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn add-flow br0 'tcp actions=group:1234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:667"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:708"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:668: ovs-ofctl -O OpenFlow15 -vwarn dump-group-stats br0 group_id=1234"
-at_fn_check_prepare_trace "ofproto.at:668"
+$as_echo "$at_srcdir/ofproto.at:709: ovs-ofctl -O OpenFlow15 -vwarn dump-group-stats br0 group_id=1234"
+at_fn_check_prepare_trace "ofproto.at:709"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-group-stats br0 group_id=1234
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:668"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:709"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:669: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:669"
+$as_echo "$at_srcdir/ofproto.at:710: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:710"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -80765,32 +81249,32 @@
 OFPST_GROUP reply (OF1.5):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:669"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:710"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:673: ovs-ofctl -O OpenFlow15 -vwarn dump-group-stats br0"
-at_fn_check_prepare_trace "ofproto.at:673"
+$as_echo "$at_srcdir/ofproto.at:714: ovs-ofctl -O OpenFlow15 -vwarn dump-group-stats br0"
+at_fn_check_prepare_trace "ofproto.at:714"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 -vwarn dump-group-stats br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:673"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:714"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:674: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:674"
+$as_echo "$at_srcdir/ofproto.at:715: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:715"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed 's/duration=[0-9.]*s/duration=?s/' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -80799,52 +81283,52 @@
 OFPST_GROUP reply (OF1.5):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:674"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:715"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:679: check_logs "
-at_fn_check_prepare_trace "ofproto.at:679"
+$as_echo "$at_srcdir/ofproto.at:720: check_logs "
+at_fn_check_prepare_trace "ofproto.at:720"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:679"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:720"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:679: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:679"
+$as_echo "$at_srcdir/ofproto.at:720: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:720"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:679"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:720"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:679: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:679"
+$as_echo "$at_srcdir/ofproto.at:720: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:720"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:679"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:720"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -80854,13 +81338,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_705
-#AT_START_706
-at_fn_group_banner 706 'ofproto.at:684' \
+#AT_STOP_707
+#AT_START_708
+at_fn_group_banner 708 'ofproto.at:725' \
   "ofproto - group add then bridge delete (OpenFlow 1.3)" "" 49
 at_xfail=no
 (
-  $as_echo "706. $at_setup_line: testing $at_desc ..."
+  $as_echo "708. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -80870,29 +81354,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:685: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:685"
+$as_echo "$at_srcdir/ofproto.at:726: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:726"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:685"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:726"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:685: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:685"
+$as_echo "$at_srcdir/ofproto.at:726: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:726"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:685"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:726"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -80902,49 +81386,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:685: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:726: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:685"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:726"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:685"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:726"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:685: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:685"
+$as_echo "$at_srcdir/ofproto.at:726: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:726"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:685"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:726"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:685: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:685"
+$as_echo "$at_srcdir/ofproto.at:726: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:726"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:685"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:726"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -80956,14 +81440,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:685: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:726: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:685"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:726"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -80971,12 +81455,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:685"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:726"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -80985,15 +81469,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:685: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:685"
+$as_echo "$at_srcdir/ofproto.at:726: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:726"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:685"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:726"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81006,75 +81490,75 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:690: ovs-ofctl -O OpenFlow13 -vwarn add-groups br0 groups.txt"
-at_fn_check_prepare_trace "ofproto.at:690"
+$as_echo "$at_srcdir/ofproto.at:731: ovs-ofctl -O OpenFlow13 -vwarn add-groups br0 groups.txt"
+at_fn_check_prepare_trace "ofproto.at:731"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 -vwarn add-groups br0 groups.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:690"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:731"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:691: ovs-vsctl del-br br0"
-at_fn_check_prepare_trace "ofproto.at:691"
+$as_echo "$at_srcdir/ofproto.at:732: ovs-vsctl del-br br0"
+at_fn_check_prepare_trace "ofproto.at:732"
 ( $at_check_trace; ovs-vsctl del-br br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:732"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:692: check_logs "
-at_fn_check_prepare_trace "ofproto.at:692"
+$as_echo "$at_srcdir/ofproto.at:733: check_logs "
+at_fn_check_prepare_trace "ofproto.at:733"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:692"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:733"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:692: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:692"
+$as_echo "$at_srcdir/ofproto.at:733: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:733"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:692"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:733"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:692: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:692"
+$as_echo "$at_srcdir/ofproto.at:733: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:733"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:692"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:733"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81084,13 +81568,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_706
-#AT_START_707
-at_fn_group_banner 707 'ofproto.at:695' \
+#AT_STOP_708
+#AT_START_709
+at_fn_group_banner 709 'ofproto.at:736' \
   "ofproto - mod-port (OpenFlow 1.0)" "              " 49
 at_xfail=no
 (
-  $as_echo "707. $at_setup_line: testing $at_desc ..."
+  $as_echo "709. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -81100,29 +81584,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:696: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:696"
+$as_echo "$at_srcdir/ofproto.at:737: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:737"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:696"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:737"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:696: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:696"
+$as_echo "$at_srcdir/ofproto.at:737: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:737"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:696"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:737"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -81132,49 +81616,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:696: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:737: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:696"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:737"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:696"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:737"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:696: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:696"
+$as_echo "$at_srcdir/ofproto.at:737: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:737"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:696"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:737"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:696: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:696"
+$as_echo "$at_srcdir/ofproto.at:737: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:737"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:696"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:737"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -81186,14 +81670,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:696: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:737: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:696"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:737"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -81201,12 +81685,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:696"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:737"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81215,15 +81699,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:696: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:696"
+$as_echo "$at_srcdir/ofproto.at:737: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:737"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:696"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:737"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81246,40 +81730,40 @@
     set $command_config_state
     command=$1 config=`echo $2 | sed 's/,/ /g'` state=$3
     { set +x
-$as_echo "$at_srcdir/ofproto.at:712: ovs-ofctl -vwarn mod-port br0 br0 \$command"
-at_fn_check_prepare_dynamic "ovs-ofctl -vwarn mod-port br0 br0 $command" "ofproto.at:712"
+$as_echo "$at_srcdir/ofproto.at:753: ovs-ofctl -vwarn mod-port br0 br0 \$command"
+at_fn_check_prepare_dynamic "ovs-ofctl -vwarn mod-port br0 br0 $command" "ofproto.at:753"
 ( $at_check_trace; ovs-ofctl -vwarn mod-port br0 br0 $command
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:712"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:753"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
     { set +x
-$as_echo "$at_srcdir/ofproto.at:713: ovs-ofctl -vwarn show br0"
-at_fn_check_prepare_trace "ofproto.at:713"
+$as_echo "$at_srcdir/ofproto.at:754: ovs-ofctl -vwarn show br0"
+at_fn_check_prepare_trace "ofproto.at:754"
 ( $at_check_trace; ovs-ofctl -vwarn show br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:713"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:754"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
     { set +x
-$as_echo "$at_srcdir/ofproto.at:714: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:714"
+$as_echo "$at_srcdir/ofproto.at:755: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:755"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -81294,7 +81778,7 @@
 OFPT_GET_CONFIG_REPLY: frags=normal miss_send_len=0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:714"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:755"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81302,45 +81786,45 @@
 
 done
 { set +x
-$as_echo "$at_srcdir/ofproto.at:726: check_logs "
-at_fn_check_prepare_trace "ofproto.at:726"
+$as_echo "$at_srcdir/ofproto.at:767: check_logs "
+at_fn_check_prepare_trace "ofproto.at:767"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:726"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:767"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:726: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:726"
+$as_echo "$at_srcdir/ofproto.at:767: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:767"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:726"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:767"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:726: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:726"
+$as_echo "$at_srcdir/ofproto.at:767: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:767"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:726"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:767"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81350,13 +81834,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_707
-#AT_START_708
-at_fn_group_banner 708 'ofproto.at:729' \
+#AT_STOP_709
+#AT_START_710
+at_fn_group_banner 710 'ofproto.at:770' \
   "ofproto - mod-port (OpenFlow 1.2)" "              " 49
 at_xfail=no
 (
-  $as_echo "708. $at_setup_line: testing $at_desc ..."
+  $as_echo "710. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -81366,29 +81850,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:730: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:730"
+$as_echo "$at_srcdir/ofproto.at:771: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:771"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:771"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:730: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:730"
+$as_echo "$at_srcdir/ofproto.at:771: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:771"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:771"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -81398,49 +81882,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:730: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:771: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:730"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:771"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:771"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:730: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:730"
+$as_echo "$at_srcdir/ofproto.at:771: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:771"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:771"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:730: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:730"
+$as_echo "$at_srcdir/ofproto.at:771: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:771"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:771"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -81452,14 +81936,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:730: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:771: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:730"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:771"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -81467,12 +81951,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:771"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81481,15 +81965,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:730: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:730"
+$as_echo "$at_srcdir/ofproto.at:771: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:771"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:771"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81510,40 +81994,40 @@
     set $command_config_state
     command=$1 config=`echo $2 | sed 's/,/ /g'` state=$3
     { set +x
-$as_echo "$at_srcdir/ofproto.at:744: ovs-ofctl -O OpenFlow12 -vwarn mod-port br0 br0 \$command"
-at_fn_check_prepare_dynamic "ovs-ofctl -O OpenFlow12 -vwarn mod-port br0 br0 $command" "ofproto.at:744"
+$as_echo "$at_srcdir/ofproto.at:785: ovs-ofctl -O OpenFlow12 -vwarn mod-port br0 br0 \$command"
+at_fn_check_prepare_dynamic "ovs-ofctl -O OpenFlow12 -vwarn mod-port br0 br0 $command" "ofproto.at:785"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 -vwarn mod-port br0 br0 $command
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:744"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:785"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
     { set +x
-$as_echo "$at_srcdir/ofproto.at:745: ovs-ofctl -O OpenFlow12 -vwarn show br0"
-at_fn_check_prepare_trace "ofproto.at:745"
+$as_echo "$at_srcdir/ofproto.at:786: ovs-ofctl -O OpenFlow12 -vwarn show br0"
+at_fn_check_prepare_trace "ofproto.at:786"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 -vwarn show br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:745"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:786"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
     { set +x
-$as_echo "$at_srcdir/ofproto.at:746: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:746"
+$as_echo "$at_srcdir/ofproto.at:787: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:787"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -81557,7 +82041,7 @@
 OFPT_GET_CONFIG_REPLY (OF1.2): frags=normal miss_send_len=0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:746"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:787"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81565,45 +82049,45 @@
 
 done
 { set +x
-$as_echo "$at_srcdir/ofproto.at:757: check_logs "
-at_fn_check_prepare_trace "ofproto.at:757"
+$as_echo "$at_srcdir/ofproto.at:798: check_logs "
+at_fn_check_prepare_trace "ofproto.at:798"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:757"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:798"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:757: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:757"
+$as_echo "$at_srcdir/ofproto.at:798: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:798"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:757"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:798"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:757: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:757"
+$as_echo "$at_srcdir/ofproto.at:798: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:798"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:757"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:798"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81613,13 +82097,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_708
-#AT_START_709
-at_fn_group_banner 709 'ofproto.at:760' \
+#AT_STOP_710
+#AT_START_711
+at_fn_group_banner 711 'ofproto.at:801' \
   "ofproto - mod-port (OpenFlow 1.4)" "              " 49
 at_xfail=no
 (
-  $as_echo "709. $at_setup_line: testing $at_desc ..."
+  $as_echo "711. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -81629,29 +82113,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:761: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:761"
+$as_echo "$at_srcdir/ofproto.at:802: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:802"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:802"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:761: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:761"
+$as_echo "$at_srcdir/ofproto.at:802: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:802"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:802"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -81661,49 +82145,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:761: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:802: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:761"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:802"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:802"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:761: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:761"
+$as_echo "$at_srcdir/ofproto.at:802: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:802"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:802"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:761: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:761"
+$as_echo "$at_srcdir/ofproto.at:802: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:802"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:802"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -81715,14 +82199,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:761: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:802: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:761"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:802"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -81730,12 +82214,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:802"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81744,15 +82228,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:761: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:761"
+$as_echo "$at_srcdir/ofproto.at:802: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:802"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:802"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81773,40 +82257,40 @@
     set $command_config_state
     command=$1 config=`echo $2 | sed 's/,/ /g'` state=$3
     { set +x
-$as_echo "$at_srcdir/ofproto.at:775: ovs-ofctl -O OpenFlow14 -vwarn mod-port br0 br0 \$command"
-at_fn_check_prepare_dynamic "ovs-ofctl -O OpenFlow14 -vwarn mod-port br0 br0 $command" "ofproto.at:775"
+$as_echo "$at_srcdir/ofproto.at:816: ovs-ofctl -O OpenFlow14 -vwarn mod-port br0 br0 \$command"
+at_fn_check_prepare_dynamic "ovs-ofctl -O OpenFlow14 -vwarn mod-port br0 br0 $command" "ofproto.at:816"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 -vwarn mod-port br0 br0 $command
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:775"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:816"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
     { set +x
-$as_echo "$at_srcdir/ofproto.at:776: ovs-ofctl -O OpenFlow14 -vwarn show br0"
-at_fn_check_prepare_trace "ofproto.at:776"
+$as_echo "$at_srcdir/ofproto.at:817: ovs-ofctl -O OpenFlow14 -vwarn show br0"
+at_fn_check_prepare_trace "ofproto.at:817"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 -vwarn show br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:776"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:817"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
     { set +x
-$as_echo "$at_srcdir/ofproto.at:777: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ofproto.at:777"
+$as_echo "$at_srcdir/ofproto.at:818: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ofproto.at:818"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -81821,7 +82305,7 @@
 OFPT_GET_CONFIG_REPLY (OF1.4): frags=normal miss_send_len=0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:777"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:818"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81829,45 +82313,45 @@
 
 done
 { set +x
-$as_echo "$at_srcdir/ofproto.at:789: check_logs "
-at_fn_check_prepare_trace "ofproto.at:789"
+$as_echo "$at_srcdir/ofproto.at:830: check_logs "
+at_fn_check_prepare_trace "ofproto.at:830"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:789"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:789: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:789"
+$as_echo "$at_srcdir/ofproto.at:830: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:830"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:789"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:789: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:789"
+$as_echo "$at_srcdir/ofproto.at:830: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:830"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:789"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -81877,13 +82361,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_709
-#AT_START_710
-at_fn_group_banner 710 'ofproto.at:792' \
+#AT_STOP_711
+#AT_START_712
+at_fn_group_banner 712 'ofproto.at:833' \
   "ofproto - basic flow_mod commands (NXM)" "        " 49
 at_xfail=no
 (
-  $as_echo "710. $at_setup_line: testing $at_desc ..."
+  $as_echo "712. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -81893,29 +82377,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:793: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:793"
+$as_echo "$at_srcdir/ofproto.at:834: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:834"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:793"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:834"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:793: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:793"
+$as_echo "$at_srcdir/ofproto.at:834: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:834"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:793"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:834"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -81925,49 +82409,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:793: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:834: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:793"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:834"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:793"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:834"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:793: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:793"
+$as_echo "$at_srcdir/ofproto.at:834: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:834"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:793"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:834"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:793: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:793"
+$as_echo "$at_srcdir/ofproto.at:834: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:834"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:793"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:834"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -81979,14 +82463,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:793: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:834: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:793"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:834"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -81994,12 +82478,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:793"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:834"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -82008,15 +82492,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:793: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:793"
+$as_echo "$at_srcdir/ofproto.at:834: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:834"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:793"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:834"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -82024,72 +82508,72 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:794: ovs-ofctl dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:794"
+$as_echo "$at_srcdir/ofproto.at:835: ovs-ofctl dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:835"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:794"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:835"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:796: echo 'in_port=2,actions=1' | ovs-ofctl add-flows br0 -"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:796"
+$as_echo "$at_srcdir/ofproto.at:837: echo 'in_port=2,actions=1' | ovs-ofctl add-flows br0 -"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:837"
 ( $at_check_trace; echo 'in_port=2,actions=1' | ovs-ofctl add-flows br0 -
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:796"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:837"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:797: ovs-ofctl add-flow br0 in_port=1,actions=2"
-at_fn_check_prepare_trace "ofproto.at:797"
+$as_echo "$at_srcdir/ofproto.at:838: ovs-ofctl add-flow br0 in_port=1,actions=2"
+at_fn_check_prepare_trace "ofproto.at:838"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=1,actions=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:797"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:838"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:798: ovs-ofctl -F nxm add-flow br0 table=1,in_port=4,actions=3"
-at_fn_check_prepare_trace "ofproto.at:798"
+$as_echo "$at_srcdir/ofproto.at:839: ovs-ofctl -F nxm add-flow br0 table=1,in_port=4,actions=3"
+at_fn_check_prepare_trace "ofproto.at:839"
 ( $at_check_trace; ovs-ofctl -F nxm add-flow br0 table=1,in_port=4,actions=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:798"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:839"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:799: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:799"
+$as_echo "$at_srcdir/ofproto.at:840: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:840"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -82099,101 +82583,101 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:799"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:840"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:805: ovs-ofctl dump-aggregate br0 table=0 | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:805"
+$as_echo "$at_srcdir/ofproto.at:846: ovs-ofctl dump-aggregate br0 table=0 | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:846"
 ( $at_check_trace; ovs-ofctl dump-aggregate br0 table=0 | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:805"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:808: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "ofproto.at:808"
+$as_echo "$at_srcdir/ofproto.at:849: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "ofproto.at:849"
 ( $at_check_trace; ovs-ofctl del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:808"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:849"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:809: ovs-ofctl dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:809"
+$as_echo "$at_srcdir/ofproto.at:850: ovs-ofctl dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:850"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:809"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:850"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:811: check_logs "
-at_fn_check_prepare_trace "ofproto.at:811"
+$as_echo "$at_srcdir/ofproto.at:852: check_logs "
+at_fn_check_prepare_trace "ofproto.at:852"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:811"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:852"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:811: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:811"
+$as_echo "$at_srcdir/ofproto.at:852: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:852"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:811"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:852"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:811: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:811"
+$as_echo "$at_srcdir/ofproto.at:852: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:852"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:811"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:852"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -82203,13 +82687,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_710
-#AT_START_711
-at_fn_group_banner 711 'ofproto.at:814' \
+#AT_STOP_712
+#AT_START_713
+at_fn_group_banner 713 'ofproto.at:855' \
   "ofproto - basic flow_mod commands (OpenFlow 1.0)" "" 49
 at_xfail=no
 (
-  $as_echo "711. $at_setup_line: testing $at_desc ..."
+  $as_echo "713. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -82219,29 +82703,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:815: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:815"
+$as_echo "$at_srcdir/ofproto.at:856: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:856"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:815"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:856"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:815: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:815"
+$as_echo "$at_srcdir/ofproto.at:856: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:856"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:815"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:856"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -82251,49 +82735,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:815: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:856: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:815"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:856"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:815"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:856"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:815: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:815"
+$as_echo "$at_srcdir/ofproto.at:856: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:856"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:815"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:856"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:815: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:815"
+$as_echo "$at_srcdir/ofproto.at:856: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:856"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:815"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:856"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -82305,14 +82789,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:815: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:856: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:815"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:856"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -82320,12 +82804,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:815"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:856"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -82334,15 +82818,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:815: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:815"
+$as_echo "$at_srcdir/ofproto.at:856: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:856"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:815"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:856"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -82350,72 +82834,72 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:816: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:816"
+$as_echo "$at_srcdir/ofproto.at:857: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:857"
 ( $at_check_trace; ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:816"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:857"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:818: echo 'in_port=2,actions=1' | ovs-ofctl -F openflow10 add-flows br0 -"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:818"
+$as_echo "$at_srcdir/ofproto.at:859: echo 'in_port=2,actions=1' | ovs-ofctl -F openflow10 add-flows br0 -"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:859"
 ( $at_check_trace; echo 'in_port=2,actions=1' | ovs-ofctl -F openflow10 add-flows br0 -
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:818"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:859"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:819: ovs-ofctl -F openflow10 add-flow br0 in_port=1,actions=2"
-at_fn_check_prepare_trace "ofproto.at:819"
+$as_echo "$at_srcdir/ofproto.at:860: ovs-ofctl -F openflow10 add-flow br0 in_port=1,actions=2"
+at_fn_check_prepare_trace "ofproto.at:860"
 ( $at_check_trace; ovs-ofctl -F openflow10 add-flow br0 in_port=1,actions=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:819"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:860"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:820: ovs-ofctl -F openflow10 add-flow br0 table=1,in_port=4,actions=3"
-at_fn_check_prepare_trace "ofproto.at:820"
+$as_echo "$at_srcdir/ofproto.at:861: ovs-ofctl -F openflow10 add-flow br0 table=1,in_port=4,actions=3"
+at_fn_check_prepare_trace "ofproto.at:861"
 ( $at_check_trace; ovs-ofctl -F openflow10 add-flow br0 table=1,in_port=4,actions=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:820"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:861"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:821: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:821"
+$as_echo "$at_srcdir/ofproto.at:862: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:862"
 ( $at_check_trace; ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -82425,101 +82909,101 @@
 OFPST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:821"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:862"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:827: ovs-ofctl -F openflow10 dump-aggregate br0 table=0 | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:827"
+$as_echo "$at_srcdir/ofproto.at:868: ovs-ofctl -F openflow10 dump-aggregate br0 table=0 | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:868"
 ( $at_check_trace; ovs-ofctl -F openflow10 dump-aggregate br0 table=0 | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:827"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:868"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:830: ovs-ofctl -F openflow10 del-flows br0"
-at_fn_check_prepare_trace "ofproto.at:830"
+$as_echo "$at_srcdir/ofproto.at:871: ovs-ofctl -F openflow10 del-flows br0"
+at_fn_check_prepare_trace "ofproto.at:871"
 ( $at_check_trace; ovs-ofctl -F openflow10 del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:830"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:871"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:831: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:831"
+$as_echo "$at_srcdir/ofproto.at:872: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:872"
 ( $at_check_trace; ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:831"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:872"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:833: check_logs "
-at_fn_check_prepare_trace "ofproto.at:833"
+$as_echo "$at_srcdir/ofproto.at:874: check_logs "
+at_fn_check_prepare_trace "ofproto.at:874"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:833"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:874"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:833: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:833"
+$as_echo "$at_srcdir/ofproto.at:874: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:874"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:833"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:874"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:833: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:833"
+$as_echo "$at_srcdir/ofproto.at:874: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:874"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:833"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:874"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -82529,13 +83013,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_711
-#AT_START_712
-at_fn_group_banner 712 'ofproto.at:836' \
+#AT_STOP_713
+#AT_START_714
+at_fn_group_banner 714 'ofproto.at:877' \
   "ofproto - basic flow_mod commands (OpenFlow 1.1)" "" 49
 at_xfail=no
 (
-  $as_echo "712. $at_setup_line: testing $at_desc ..."
+  $as_echo "714. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -82545,29 +83029,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:837: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:837"
+$as_echo "$at_srcdir/ofproto.at:878: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:878"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:837"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:878"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:837: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:837"
+$as_echo "$at_srcdir/ofproto.at:878: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:878"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:837"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:878"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -82577,49 +83061,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:837: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:878: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:837"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:878"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:837"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:878"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:837: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:837"
+$as_echo "$at_srcdir/ofproto.at:878: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:878"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:837"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:878"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:837: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:837"
+$as_echo "$at_srcdir/ofproto.at:878: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:878"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:837"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:878"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -82631,14 +83115,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:837: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:878: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:837"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:878"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -82646,12 +83130,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:837"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:878"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -82660,15 +83144,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:837: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:837"
+$as_echo "$at_srcdir/ofproto.at:878: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:878"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:837"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:878"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -82676,72 +83160,72 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:838: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:838"
+$as_echo "$at_srcdir/ofproto.at:879: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:879"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:838"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:879"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:840: echo 'in_port=2,actions=1' | ovs-ofctl -O OpenFlow11 add-flows br0 -"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:840"
+$as_echo "$at_srcdir/ofproto.at:881: echo 'in_port=2,actions=1' | ovs-ofctl -O OpenFlow11 add-flows br0 -"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:881"
 ( $at_check_trace; echo 'in_port=2,actions=1' | ovs-ofctl -O OpenFlow11 add-flows br0 -
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:840"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:881"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:841: ovs-ofctl -O OpenFlow11 add-flow br0 in_port=1,actions=2"
-at_fn_check_prepare_trace "ofproto.at:841"
+$as_echo "$at_srcdir/ofproto.at:882: ovs-ofctl -O OpenFlow11 add-flow br0 in_port=1,actions=2"
+at_fn_check_prepare_trace "ofproto.at:882"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 in_port=1,actions=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:882"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:842: ovs-ofctl -O OpenFlow11 add-flow br0 table=1,in_port=4,actions=3"
-at_fn_check_prepare_trace "ofproto.at:842"
+$as_echo "$at_srcdir/ofproto.at:883: ovs-ofctl -O OpenFlow11 add-flow br0 table=1,in_port=4,actions=3"
+at_fn_check_prepare_trace "ofproto.at:883"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 table=1,in_port=4,actions=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:842"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:883"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:843: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:843"
+$as_echo "$at_srcdir/ofproto.at:884: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:884"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -82751,49 +83235,49 @@
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:843"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:849: ovs-ofctl -O OpenFlow11 dump-aggregate br0 table=0 | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:849"
+$as_echo "$at_srcdir/ofproto.at:890: ovs-ofctl -O OpenFlow11 dump-aggregate br0 table=0 | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:890"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-aggregate br0 table=0 | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_AGGREGATE reply (OF1.1): packet_count=0 byte_count=0 flow_count=2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:849"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:852: ovs-ofctl -O OpenFlow11 del-flows br0"
-at_fn_check_prepare_trace "ofproto.at:852"
+$as_echo "$at_srcdir/ofproto.at:893: ovs-ofctl -O OpenFlow11 del-flows br0"
+at_fn_check_prepare_trace "ofproto.at:893"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:852"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:893"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:853: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:853"
+$as_echo "$at_srcdir/ofproto.at:894: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:894"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -82801,52 +83285,52 @@
  table=1, in_port=4 actions=output:3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:853"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:894"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:856: check_logs "
-at_fn_check_prepare_trace "ofproto.at:856"
+$as_echo "$at_srcdir/ofproto.at:897: check_logs "
+at_fn_check_prepare_trace "ofproto.at:897"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:856"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:897"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:856: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:856"
+$as_echo "$at_srcdir/ofproto.at:897: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:897"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:856"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:897"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:856: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:856"
+$as_echo "$at_srcdir/ofproto.at:897: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:897"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:856"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:897"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -82856,13 +83340,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_712
-#AT_START_713
-at_fn_group_banner 713 'ofproto.at:859' \
+#AT_STOP_714
+#AT_START_715
+at_fn_group_banner 715 'ofproto.at:900' \
   "ofproto - flow_mod negative test (OpenFlow 1.1)" "" 49
 at_xfail=no
 (
-  $as_echo "713. $at_setup_line: testing $at_desc ..."
+  $as_echo "715. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -82872,29 +83356,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:860: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:860"
+$as_echo "$at_srcdir/ofproto.at:901: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:901"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:860"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:901"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:860: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:860"
+$as_echo "$at_srcdir/ofproto.at:901: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:901"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:860"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:901"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -82904,49 +83388,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:860: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:901: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:860"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:901"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:860"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:901"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:860: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:860"
+$as_echo "$at_srcdir/ofproto.at:901: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:901"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:860"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:901"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:860: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:860"
+$as_echo "$at_srcdir/ofproto.at:901: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:901"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:860"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:901"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -82958,14 +83442,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:860: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:901: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:860"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:901"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -82973,12 +83457,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:860"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:901"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -82987,15 +83471,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:860: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13 "
-at_fn_check_prepare_trace "ofproto.at:860"
+$as_echo "$at_srcdir/ofproto.at:901: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13 "
+at_fn_check_prepare_trace "ofproto.at:901"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:860"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:901"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -83003,15 +83487,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:862: ovs-ofctl add-flow -O OpenFlow11 br0 table=1,action=goto_table:2"
-at_fn_check_prepare_trace "ofproto.at:862"
+$as_echo "$at_srcdir/ofproto.at:903: ovs-ofctl add-flow -O OpenFlow11 br0 table=1,action=goto_table:2"
+at_fn_check_prepare_trace "ofproto.at:903"
 ( $at_check_trace; ovs-ofctl add-flow -O OpenFlow11 br0 table=1,action=goto_table:2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:862"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:903"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -83021,62 +83505,62 @@
 # The error message here actually comes from ovs-ofctl, not from ovs-vswitchd,
 # but at least it's the same code in ofpacts_check() that issues the error.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:866: ovs-ofctl add-flow -O OpenFlow11 br0 table=1,action=goto_table:1"
-at_fn_check_prepare_trace "ofproto.at:866"
+$as_echo "$at_srcdir/ofproto.at:907: ovs-ofctl add-flow -O OpenFlow11 br0 table=1,action=goto_table:1"
+at_fn_check_prepare_trace "ofproto.at:907"
 ( $at_check_trace; ovs-ofctl add-flow -O OpenFlow11 br0 table=1,action=goto_table:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-ofctl: actions are invalid with specified match (OFPBIC_BAD_TABLE_ID)
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:866"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:907"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:870: check_logs "
-at_fn_check_prepare_trace "ofproto.at:870"
+$as_echo "$at_srcdir/ofproto.at:911: check_logs "
+at_fn_check_prepare_trace "ofproto.at:911"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:870"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:911"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:870: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:870"
+$as_echo "$at_srcdir/ofproto.at:911: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:911"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:870"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:911"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:870: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:870"
+$as_echo "$at_srcdir/ofproto.at:911: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:911"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:870"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:911"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -83086,13 +83570,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_713
-#AT_START_714
-at_fn_group_banner 714 'ofproto.at:873' \
+#AT_STOP_715
+#AT_START_716
+at_fn_group_banner 716 'ofproto.at:914' \
   "ofproto - set-field flow_mod commands (NXM)" "    " 49
 at_xfail=no
 (
-  $as_echo "714. $at_setup_line: testing $at_desc ..."
+  $as_echo "716. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -83102,29 +83586,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:874: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:874"
+$as_echo "$at_srcdir/ofproto.at:915: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:915"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:874"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:915"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:874: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:874"
+$as_echo "$at_srcdir/ofproto.at:915: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:915"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:874"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:915"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -83134,49 +83618,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:874: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:915: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:874"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:915"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:874"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:915"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:874: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:874"
+$as_echo "$at_srcdir/ofproto.at:915: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:915"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:874"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:915"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:874: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:874"
+$as_echo "$at_srcdir/ofproto.at:915: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:915"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:874"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:915"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -83188,14 +83672,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:874: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:915: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:874"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:915"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -83203,12 +83687,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:874"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:915"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -83217,15 +83701,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:874: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:874"
+$as_echo "$at_srcdir/ofproto.at:915: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:915"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:874"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:915"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -83233,55 +83717,55 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:875: ovs-ofctl add-flow br0 ipv6,table=1,in_port=3,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:875"
+$as_echo "$at_srcdir/ofproto.at:916: ovs-ofctl add-flow br0 ipv6,table=1,in_port=3,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:916"
 ( $at_check_trace; ovs-ofctl add-flow br0 ipv6,table=1,in_port=3,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:875"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:916"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:876: ovs-ofctl add-flow br0 ipv6,table=1,in_port=3,actions=set_field:fe80:0123:4567:890a:a6ba:dbff:fefe:59fa-\\>ipv6_src"
-at_fn_check_prepare_trace "ofproto.at:876"
+$as_echo "$at_srcdir/ofproto.at:917: ovs-ofctl add-flow br0 ipv6,table=1,in_port=3,actions=set_field:fe80:0123:4567:890a:a6ba:dbff:fefe:59fa-\\>ipv6_src"
+at_fn_check_prepare_trace "ofproto.at:917"
 ( $at_check_trace; ovs-ofctl add-flow br0 ipv6,table=1,in_port=3,actions=set_field:fe80:0123:4567:890a:a6ba:dbff:fefe:59fa-\>ipv6_src
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:876"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:917"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:877: ovs-ofctl add-flow br0 icmp6,icmp_type=136,table=1,in_port=3,actions=set_field:fe80:8675:3097:890a:a6ba:dbff:f00d:59fa-\\>nd_target,set_field:cc:dd:ee:ff:00:11-\\>nd_tll"
-at_fn_check_prepare_trace "ofproto.at:877"
+$as_echo "$at_srcdir/ofproto.at:918: ovs-ofctl add-flow br0 icmp6,icmp_type=136,table=1,in_port=3,actions=set_field:fe80:8675:3097:890a:a6ba:dbff:f00d:59fa-\\>nd_target,set_field:cc:dd:ee:ff:00:11-\\>nd_tll"
+at_fn_check_prepare_trace "ofproto.at:918"
 ( $at_check_trace; ovs-ofctl add-flow br0 icmp6,icmp_type=136,table=1,in_port=3,actions=set_field:fe80:8675:3097:890a:a6ba:dbff:f00d:59fa-\>nd_target,set_field:cc:dd:ee:ff:00:11-\>nd_tll
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:877"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:918"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:878: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:878"
+$as_echo "$at_srcdir/ofproto.at:919: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:919"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -83290,52 +83774,52 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:878"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:919"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:883: check_logs "
-at_fn_check_prepare_trace "ofproto.at:883"
+$as_echo "$at_srcdir/ofproto.at:924: check_logs "
+at_fn_check_prepare_trace "ofproto.at:924"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:883"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:924"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:883: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:883"
+$as_echo "$at_srcdir/ofproto.at:924: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:924"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:883"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:924"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:883: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:883"
+$as_echo "$at_srcdir/ofproto.at:924: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:924"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:883"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:924"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -83345,13 +83829,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_714
-#AT_START_715
-at_fn_group_banner 715 'ofproto.at:886' \
+#AT_STOP_716
+#AT_START_717
+at_fn_group_banner 717 'ofproto.at:927' \
   "ofproto - basic flow_mod commands (OpenFlow 1.2)" "" 49
 at_xfail=no
 (
-  $as_echo "715. $at_setup_line: testing $at_desc ..."
+  $as_echo "717. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -83361,29 +83845,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:887: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:887"
+$as_echo "$at_srcdir/ofproto.at:928: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:928"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:887"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:928"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:887: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:887"
+$as_echo "$at_srcdir/ofproto.at:928: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:928"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:887"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:928"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -83393,49 +83877,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:887: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:928: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:887"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:928"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:887"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:928"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:887: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:887"
+$as_echo "$at_srcdir/ofproto.at:928: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:928"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:887"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:928"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:887: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:887"
+$as_echo "$at_srcdir/ofproto.at:928: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:928"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:887"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:928"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -83447,14 +83931,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:887: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:928: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:887"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:928"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -83462,12 +83946,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:887"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:928"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -83476,15 +83960,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:887: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:887"
+$as_echo "$at_srcdir/ofproto.at:928: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:928"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:887"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:928"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -83492,72 +83976,72 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:888: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:888"
+$as_echo "$at_srcdir/ofproto.at:929: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:929"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:888"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:929"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:890: echo 'in_port=2,actions=1' | ovs-ofctl -O OpenFlow12 add-flows br0 -"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:890"
+$as_echo "$at_srcdir/ofproto.at:931: echo 'in_port=2,actions=1' | ovs-ofctl -O OpenFlow12 add-flows br0 -"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:931"
 ( $at_check_trace; echo 'in_port=2,actions=1' | ovs-ofctl -O OpenFlow12 add-flows br0 -
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:890"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:931"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:891: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=1,actions=2"
-at_fn_check_prepare_trace "ofproto.at:891"
+$as_echo "$at_srcdir/ofproto.at:932: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=1,actions=2"
+at_fn_check_prepare_trace "ofproto.at:932"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 in_port=1,actions=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:891"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:932"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:892: ovs-ofctl -O OpenFlow12 add-flow br0 table=1,in_port=4,actions=3"
-at_fn_check_prepare_trace "ofproto.at:892"
+$as_echo "$at_srcdir/ofproto.at:933: ovs-ofctl -O OpenFlow12 add-flow br0 table=1,in_port=4,actions=3"
+at_fn_check_prepare_trace "ofproto.at:933"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 table=1,in_port=4,actions=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:892"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:933"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:893: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:893"
+$as_echo "$at_srcdir/ofproto.at:934: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:934"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -83567,84 +84051,84 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:893"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:934"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:899: ovs-ofctl -O OpenFlow12 del-flows br0"
-at_fn_check_prepare_trace "ofproto.at:899"
+$as_echo "$at_srcdir/ofproto.at:940: ovs-ofctl -O OpenFlow12 del-flows br0"
+at_fn_check_prepare_trace "ofproto.at:940"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:899"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:940"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:900: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:900"
+$as_echo "$at_srcdir/ofproto.at:941: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:941"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:900"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:902: check_logs "
-at_fn_check_prepare_trace "ofproto.at:902"
+$as_echo "$at_srcdir/ofproto.at:943: check_logs "
+at_fn_check_prepare_trace "ofproto.at:943"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:902"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:943"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:902: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:902"
+$as_echo "$at_srcdir/ofproto.at:943: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:943"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:902"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:943"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:902: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:902"
+$as_echo "$at_srcdir/ofproto.at:943: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:943"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:902"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:943"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -83654,13 +84138,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_715
-#AT_START_716
-at_fn_group_banner 716 'ofproto.at:905' \
+#AT_STOP_717
+#AT_START_718
+at_fn_group_banner 718 'ofproto.at:946' \
   "ofproto - set-field flow_mod commands (OF1.2)" "  " 49
 at_xfail=no
 (
-  $as_echo "716. $at_setup_line: testing $at_desc ..."
+  $as_echo "718. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -83670,29 +84154,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:906: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:906"
+$as_echo "$at_srcdir/ofproto.at:947: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:947"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:906"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:947"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:906: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:906"
+$as_echo "$at_srcdir/ofproto.at:947: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:947"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:906"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:947"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -83702,49 +84186,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:906: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:947: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:906"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:947"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:906"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:947"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:906: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:906"
+$as_echo "$at_srcdir/ofproto.at:947: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:947"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:906"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:947"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:906: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:906"
+$as_echo "$at_srcdir/ofproto.at:947: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:947"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:906"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:947"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -83756,14 +84240,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:906: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:947: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:906"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:947"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -83771,12 +84255,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:906"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:947"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -83785,15 +84269,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:906: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:906"
+$as_echo "$at_srcdir/ofproto.at:947: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:947"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:906"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:947"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -83801,55 +84285,55 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:907: ovs-ofctl -O OpenFlow12 add-flow br0 ipv6,table=1,in_port=3,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:907"
+$as_echo "$at_srcdir/ofproto.at:948: ovs-ofctl -O OpenFlow12 add-flow br0 ipv6,table=1,in_port=3,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:948"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 ipv6,table=1,in_port=3,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:907"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:948"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:908: ovs-ofctl -O OpenFlow12 add-flow br0 ipv6,table=1,in_port=3,actions=set_field:fe80:0123:4567:890a:a6ba:dbff:fefe:59fa-\\>ipv6_src"
-at_fn_check_prepare_trace "ofproto.at:908"
+$as_echo "$at_srcdir/ofproto.at:949: ovs-ofctl -O OpenFlow12 add-flow br0 ipv6,table=1,in_port=3,actions=set_field:fe80:0123:4567:890a:a6ba:dbff:fefe:59fa-\\>ipv6_src"
+at_fn_check_prepare_trace "ofproto.at:949"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 ipv6,table=1,in_port=3,actions=set_field:fe80:0123:4567:890a:a6ba:dbff:fefe:59fa-\>ipv6_src
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:908"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:949"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:909: ovs-ofctl -O OpenFlow12 add-flow br0 icmp6,icmp_type=136,table=1,in_port=3,actions=set_field:fe80:8675:3097:890a:a6ba:dbff:f00d:59fa-\\>nd_target,set_field:cc:dd:ee:ff:00:11-\\>nd_tll"
-at_fn_check_prepare_trace "ofproto.at:909"
+$as_echo "$at_srcdir/ofproto.at:950: ovs-ofctl -O OpenFlow12 add-flow br0 icmp6,icmp_type=136,table=1,in_port=3,actions=set_field:fe80:8675:3097:890a:a6ba:dbff:f00d:59fa-\\>nd_target,set_field:cc:dd:ee:ff:00:11-\\>nd_tll"
+at_fn_check_prepare_trace "ofproto.at:950"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 icmp6,icmp_type=136,table=1,in_port=3,actions=set_field:fe80:8675:3097:890a:a6ba:dbff:f00d:59fa-\>nd_target,set_field:cc:dd:ee:ff:00:11-\>nd_tll
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:909"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:950"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:910: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:910"
+$as_echo "$at_srcdir/ofproto.at:951: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:951"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -83858,52 +84342,52 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:910"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:951"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:915: check_logs "
-at_fn_check_prepare_trace "ofproto.at:915"
+$as_echo "$at_srcdir/ofproto.at:956: check_logs "
+at_fn_check_prepare_trace "ofproto.at:956"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:915"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:956"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:915: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:915"
+$as_echo "$at_srcdir/ofproto.at:956: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:956"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:915"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:956"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:915: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:915"
+$as_echo "$at_srcdir/ofproto.at:956: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:956"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:915"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:956"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -83913,13 +84397,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_716
-#AT_START_717
-at_fn_group_banner 717 'ofproto.at:918' \
+#AT_STOP_718
+#AT_START_719
+at_fn_group_banner 719 'ofproto.at:959' \
   "ofproto - dump flows with cookie" "               " 49
 at_xfail=no
 (
-  $as_echo "717. $at_setup_line: testing $at_desc ..."
+  $as_echo "719. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -83929,29 +84413,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:919: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:919"
+$as_echo "$at_srcdir/ofproto.at:960: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:960"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:919"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:960"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:919: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:919"
+$as_echo "$at_srcdir/ofproto.at:960: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:960"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:919"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:960"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -83961,49 +84445,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:919: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:960: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:919"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:960"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:919"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:960"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:919: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:919"
+$as_echo "$at_srcdir/ofproto.at:960: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:960"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:919"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:960"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:919: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:919"
+$as_echo "$at_srcdir/ofproto.at:960: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:960"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:919"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:960"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -84015,14 +84499,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:919: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:960: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:919"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:960"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -84030,12 +84514,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:919"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:960"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84044,15 +84528,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:919: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:919"
+$as_echo "$at_srcdir/ofproto.at:960: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:960"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:919"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:960"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84060,55 +84544,55 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:920: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:920"
+$as_echo "$at_srcdir/ofproto.at:961: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:961"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:920"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:961"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:921: ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1"
-at_fn_check_prepare_trace "ofproto.at:921"
+$as_echo "$at_srcdir/ofproto.at:962: ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1"
+at_fn_check_prepare_trace "ofproto.at:962"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:921"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:962"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:922: ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1"
-at_fn_check_prepare_trace "ofproto.at:922"
+$as_echo "$at_srcdir/ofproto.at:963: ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1"
+at_fn_check_prepare_trace "ofproto.at:963"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:922"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:963"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:923: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:923"
+$as_echo "$at_srcdir/ofproto.at:964: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:964"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -84118,34 +84602,34 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:923"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:964"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:929: ovs-ofctl dump-aggregate br0 table=0 | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:929"
+$as_echo "$at_srcdir/ofproto.at:970: ovs-ofctl dump-aggregate br0 table=0 | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:970"
 ( $at_check_trace; ovs-ofctl dump-aggregate br0 table=0 | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:929"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:970"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:932: ovs-ofctl dump-flows br0 cookie=0x3/-1 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:932"
+$as_echo "$at_srcdir/ofproto.at:973: ovs-ofctl dump-flows br0 cookie=0x3/-1 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:973"
 ( $at_check_trace; ovs-ofctl dump-flows br0 cookie=0x3/-1 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -84153,69 +84637,69 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:932"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:973"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:936: ovs-ofctl dump-aggregate br0 cookie=0x3/-1 | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:936"
+$as_echo "$at_srcdir/ofproto.at:977: ovs-ofctl dump-aggregate br0 cookie=0x3/-1 | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:977"
 ( $at_check_trace; ovs-ofctl dump-aggregate br0 cookie=0x3/-1 | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:936"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:977"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:939: check_logs "
-at_fn_check_prepare_trace "ofproto.at:939"
+$as_echo "$at_srcdir/ofproto.at:980: check_logs "
+at_fn_check_prepare_trace "ofproto.at:980"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:939"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:980"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:939: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:939"
+$as_echo "$at_srcdir/ofproto.at:980: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:980"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:939"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:980"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:939: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:939"
+$as_echo "$at_srcdir/ofproto.at:980: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:980"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:939"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:980"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84225,13 +84709,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_717
-#AT_START_718
-at_fn_group_banner 718 'ofproto.at:942' \
+#AT_STOP_719
+#AT_START_720
+at_fn_group_banner 720 'ofproto.at:983' \
   "ofproto - mod flow with cookie change (OpenFlow 1.0)" "" 49
 at_xfail=no
 (
-  $as_echo "718. $at_setup_line: testing $at_desc ..."
+  $as_echo "720. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -84241,29 +84725,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:943: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:943"
+$as_echo "$at_srcdir/ofproto.at:984: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:984"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:943"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:984"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:943: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:943"
+$as_echo "$at_srcdir/ofproto.at:984: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:984"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:943"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:984"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -84273,49 +84757,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:943: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:984: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:943"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:984"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:943"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:984"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:943: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:943"
+$as_echo "$at_srcdir/ofproto.at:984: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:984"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:943"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:943: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:943"
+$as_echo "$at_srcdir/ofproto.at:984: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:984"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:943"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -84327,14 +84811,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:943: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:984: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:943"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:984"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -84342,12 +84826,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:943"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84356,15 +84840,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:943: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:943"
+$as_echo "$at_srcdir/ofproto.at:984: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:984"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:943"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84372,25 +84856,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:944: ovs-ofctl -F openflow10 add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:944"
+$as_echo "$at_srcdir/ofproto.at:985: ovs-ofctl -F openflow10 add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:985"
 ( $at_check_trace; ovs-ofctl -F openflow10 add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:944"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:945: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:945"
+$as_echo "$at_srcdir/ofproto.at:986: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:986"
 ( $at_check_trace; ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -84398,7 +84882,7 @@
 OFPST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:945"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84406,25 +84890,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:950: ovs-ofctl -F openflow10 mod-flows br0 cookie=0x2,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:950"
+$as_echo "$at_srcdir/ofproto.at:991: ovs-ofctl -F openflow10 mod-flows br0 cookie=0x2,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:991"
 ( $at_check_trace; ovs-ofctl -F openflow10 mod-flows br0 cookie=0x2,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:950"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:991"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:951: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:951"
+$as_echo "$at_srcdir/ofproto.at:992: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:992"
 ( $at_check_trace; ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -84432,52 +84916,52 @@
 OFPST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:951"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:992"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:955: check_logs "
-at_fn_check_prepare_trace "ofproto.at:955"
+$as_echo "$at_srcdir/ofproto.at:996: check_logs "
+at_fn_check_prepare_trace "ofproto.at:996"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:955"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:996"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:955: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:955"
+$as_echo "$at_srcdir/ofproto.at:996: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:996"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:955"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:996"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:955: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:955"
+$as_echo "$at_srcdir/ofproto.at:996: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:996"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:955"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:996"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84487,13 +84971,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_718
-#AT_START_719
-at_fn_group_banner 719 'ofproto.at:958' \
+#AT_STOP_720
+#AT_START_721
+at_fn_group_banner 721 'ofproto.at:999' \
   "ofproto - mod flow with cookie change (NXM)" "    " 49
 at_xfail=no
 (
-  $as_echo "719. $at_setup_line: testing $at_desc ..."
+  $as_echo "721. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -84503,29 +84987,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:959: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:959"
+$as_echo "$at_srcdir/ofproto.at:1000: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1000"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:959"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1000"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:959: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:959"
+$as_echo "$at_srcdir/ofproto.at:1000: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1000"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:959"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1000"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -84535,49 +85019,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:959: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1000: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:959"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1000"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:959"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1000"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:959: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:959"
+$as_echo "$at_srcdir/ofproto.at:1000: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1000"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:959"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1000"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:959: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:959"
+$as_echo "$at_srcdir/ofproto.at:1000: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1000"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:959"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1000"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -84589,14 +85073,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:959: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1000: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:959"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1000"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -84604,12 +85088,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:959"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1000"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84618,15 +85102,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:959: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:959"
+$as_echo "$at_srcdir/ofproto.at:1000: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1000"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:959"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1000"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84634,25 +85118,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:960: ovs-ofctl -F nxm add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:960"
+$as_echo "$at_srcdir/ofproto.at:1001: ovs-ofctl -F nxm add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1001"
 ( $at_check_trace; ovs-ofctl -F nxm add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:960"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1001"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:961: ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:961"
+$as_echo "$at_srcdir/ofproto.at:1002: ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1002"
 ( $at_check_trace; ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -84660,7 +85144,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:961"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1002"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84668,25 +85152,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:966: ovs-ofctl -F nxm mod-flows br0 cookie=0x2,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:966"
+$as_echo "$at_srcdir/ofproto.at:1007: ovs-ofctl -F nxm mod-flows br0 cookie=0x2,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1007"
 ( $at_check_trace; ovs-ofctl -F nxm mod-flows br0 cookie=0x2,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:966"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1007"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:967: ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:967"
+$as_echo "$at_srcdir/ofproto.at:1008: ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1008"
 ( $at_check_trace; ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -84694,52 +85178,52 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:967"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1008"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:971: check_logs "
-at_fn_check_prepare_trace "ofproto.at:971"
+$as_echo "$at_srcdir/ofproto.at:1012: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1012"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:971"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1012"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:971: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:971"
+$as_echo "$at_srcdir/ofproto.at:1012: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1012"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:971"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1012"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:971: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:971"
+$as_echo "$at_srcdir/ofproto.at:1012: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1012"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:971"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1012"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84749,13 +85233,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_719
-#AT_START_720
-at_fn_group_banner 720 'ofproto.at:974' \
+#AT_STOP_721
+#AT_START_722
+at_fn_group_banner 722 'ofproto.at:1015' \
   "ofproto - no mod flow with cookie change (OpenFlow 1.1)" "" 49
 at_xfail=no
 (
-  $as_echo "720. $at_setup_line: testing $at_desc ..."
+  $as_echo "722. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -84765,29 +85249,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:975: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:975"
+$as_echo "$at_srcdir/ofproto.at:1016: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1016"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:975"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1016"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:975: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:975"
+$as_echo "$at_srcdir/ofproto.at:1016: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1016"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:975"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1016"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -84797,49 +85281,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:975: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1016: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:975"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1016"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:975"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1016"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:975: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:975"
+$as_echo "$at_srcdir/ofproto.at:1016: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1016"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:975"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1016"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:975: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:975"
+$as_echo "$at_srcdir/ofproto.at:1016: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1016"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:975"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1016"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -84851,14 +85335,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:975: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1016: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:975"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1016"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -84866,12 +85350,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:975"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1016"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84880,15 +85364,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:975: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:975"
+$as_echo "$at_srcdir/ofproto.at:1016: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1016"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:975"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1016"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -84896,25 +85380,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:976: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:976"
+$as_echo "$at_srcdir/ofproto.at:1017: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1017"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:976"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1017"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:977: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:977"
+$as_echo "$at_srcdir/ofproto.at:1018: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1018"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -84922,32 +85406,32 @@
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:977"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:981: ovs-ofctl -O OpenFlow11 mod-flows br0 cookie=0x2,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:981"
+$as_echo "$at_srcdir/ofproto.at:1022: ovs-ofctl -O OpenFlow11 mod-flows br0 cookie=0x2,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1022"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 mod-flows br0 cookie=0x2,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:981"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1022"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:982: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:982"
+$as_echo "$at_srcdir/ofproto.at:1023: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1023"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -84955,52 +85439,52 @@
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:982"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1023"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:986: check_logs "
-at_fn_check_prepare_trace "ofproto.at:986"
+$as_echo "$at_srcdir/ofproto.at:1027: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1027"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:986"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1027"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:986: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:986"
+$as_echo "$at_srcdir/ofproto.at:1027: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1027"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:986"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1027"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:986: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:986"
+$as_echo "$at_srcdir/ofproto.at:1027: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1027"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:986"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1027"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85010,13 +85494,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_720
-#AT_START_721
-at_fn_group_banner 721 'ofproto.at:990' \
+#AT_STOP_722
+#AT_START_723
+at_fn_group_banner 723 'ofproto.at:1031' \
   "ofproto - no mod flow with cookie change (OpenFlow 1.2)" "" 49
 at_xfail=no
 (
-  $as_echo "721. $at_setup_line: testing $at_desc ..."
+  $as_echo "723. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -85026,29 +85510,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:991: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:991"
+$as_echo "$at_srcdir/ofproto.at:1032: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1032"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:991"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1032"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:991: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:991"
+$as_echo "$at_srcdir/ofproto.at:1032: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1032"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:991"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1032"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -85058,49 +85542,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:991: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1032: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:991"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1032"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:991"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1032"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:991: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:991"
+$as_echo "$at_srcdir/ofproto.at:1032: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1032"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:991"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1032"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:991: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:991"
+$as_echo "$at_srcdir/ofproto.at:1032: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1032"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:991"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1032"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -85112,14 +85596,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:991: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1032: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:991"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1032"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -85127,12 +85611,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:991"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1032"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85141,15 +85625,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:991: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:991"
+$as_echo "$at_srcdir/ofproto.at:1032: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1032"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:991"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1032"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85157,25 +85641,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:992: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:992"
+$as_echo "$at_srcdir/ofproto.at:1033: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1033"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:992"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1033"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:993: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:993"
+$as_echo "$at_srcdir/ofproto.at:1034: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1034"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -85183,7 +85667,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:993"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1034"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85191,25 +85675,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:998: ovs-ofctl -O OpenFlow12 mod-flows br0 cookie=0x2,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:998"
+$as_echo "$at_srcdir/ofproto.at:1039: ovs-ofctl -O OpenFlow12 mod-flows br0 cookie=0x2,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1039"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 mod-flows br0 cookie=0x2,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:998"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:999: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:999"
+$as_echo "$at_srcdir/ofproto.at:1040: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1040"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -85217,52 +85701,52 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:999"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1003: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1003"
+$as_echo "$at_srcdir/ofproto.at:1044: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1044"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1003"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1044"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1003: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1003"
+$as_echo "$at_srcdir/ofproto.at:1044: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1044"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1003"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1044"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1003: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1003"
+$as_echo "$at_srcdir/ofproto.at:1044: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1044"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1003"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1044"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85272,13 +85756,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_721
-#AT_START_722
-at_fn_group_banner 722 'ofproto.at:1006' \
+#AT_STOP_723
+#AT_START_724
+at_fn_group_banner 724 'ofproto.at:1047' \
   "ofproto - mod flows based on cookie mask (OpenFlow 1.0)" "" 49
 at_xfail=no
 (
-  $as_echo "722. $at_setup_line: testing $at_desc ..."
+  $as_echo "724. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -85288,29 +85772,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1007: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1007"
+$as_echo "$at_srcdir/ofproto.at:1048: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1048"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1007"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1048"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1007: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1007"
+$as_echo "$at_srcdir/ofproto.at:1048: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1048"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1007"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1048"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -85320,49 +85804,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1007: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1048: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1007"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1048"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1007"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1048"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1007: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1007"
+$as_echo "$at_srcdir/ofproto.at:1048: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1048"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1007"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1048"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1007: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1007"
+$as_echo "$at_srcdir/ofproto.at:1048: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1048"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1007"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1048"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -85374,14 +85858,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1007: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1048: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1007"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1048"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -85389,12 +85873,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1007"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1048"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85403,15 +85887,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1007: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1007"
+$as_echo "$at_srcdir/ofproto.at:1048: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1048"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1007"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1048"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85419,55 +85903,55 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1008: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1008"
+$as_echo "$at_srcdir/ofproto.at:1049: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1049"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1008"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1049"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1009: ovs-ofctl add-flow br0 cookie=0x1,in_port=2,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1009"
+$as_echo "$at_srcdir/ofproto.at:1050: ovs-ofctl add-flow br0 cookie=0x1,in_port=2,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1050"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x1,in_port=2,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1009"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1050"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1010: ovs-ofctl add-flow br0 cookie=0x2,in_port=3,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1010"
+$as_echo "$at_srcdir/ofproto.at:1051: ovs-ofctl add-flow br0 cookie=0x2,in_port=3,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1051"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x2,in_port=3,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1010"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1051"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1011: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1011"
+$as_echo "$at_srcdir/ofproto.at:1052: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1052"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -85477,7 +85961,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1011"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1052"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85485,25 +85969,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1018: ovs-ofctl -F nxm mod-flows br0 cookie=0x1/0xff,actions=4"
-at_fn_check_prepare_trace "ofproto.at:1018"
+$as_echo "$at_srcdir/ofproto.at:1059: ovs-ofctl -F nxm mod-flows br0 cookie=0x1/0xff,actions=4"
+at_fn_check_prepare_trace "ofproto.at:1059"
 ( $at_check_trace; ovs-ofctl -F nxm mod-flows br0 cookie=0x1/0xff,actions=4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1018"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1059"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1019: ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1019"
+$as_echo "$at_srcdir/ofproto.at:1060: ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1060"
 ( $at_check_trace; ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -85513,52 +85997,52 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1019"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1060"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1025: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1025"
+$as_echo "$at_srcdir/ofproto.at:1066: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1066"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1025"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1066"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1025: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1025"
+$as_echo "$at_srcdir/ofproto.at:1066: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1066"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1025"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1066"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1025: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1025"
+$as_echo "$at_srcdir/ofproto.at:1066: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1066"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1025"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1066"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85568,13 +86052,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_722
-#AT_START_723
-at_fn_group_banner 723 'ofproto.at:1028' \
+#AT_STOP_724
+#AT_START_725
+at_fn_group_banner 725 'ofproto.at:1069' \
   "ofproto - mod flows based on cookie mask (OpenFlow 1.1)" "" 49
 at_xfail=no
 (
-  $as_echo "723. $at_setup_line: testing $at_desc ..."
+  $as_echo "725. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -85584,29 +86068,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1029: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1029"
+$as_echo "$at_srcdir/ofproto.at:1070: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1070"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1029"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1070"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1029: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1029"
+$as_echo "$at_srcdir/ofproto.at:1070: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1070"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1029"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1070"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -85616,49 +86100,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1029: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1070: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1029"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1070"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1029"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1070"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1029: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1029"
+$as_echo "$at_srcdir/ofproto.at:1070: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1070"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1029"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1070"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1029: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1029"
+$as_echo "$at_srcdir/ofproto.at:1070: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1070"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1029"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1070"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -85670,14 +86154,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1029: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1070: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1029"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1070"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -85685,12 +86169,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1029"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1070"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85699,15 +86183,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1029: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1029"
+$as_echo "$at_srcdir/ofproto.at:1070: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1070"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1029"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1070"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85715,55 +86199,55 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1030: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1030"
+$as_echo "$at_srcdir/ofproto.at:1071: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1071"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1030"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1071"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1031: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=2,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1031"
+$as_echo "$at_srcdir/ofproto.at:1072: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=2,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1072"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=2,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1031"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1072"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1032: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x2,in_port=3,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1032"
+$as_echo "$at_srcdir/ofproto.at:1073: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x2,in_port=3,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1073"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x2,in_port=3,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1032"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1073"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1033: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1033"
+$as_echo "$at_srcdir/ofproto.at:1074: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1074"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -85773,7 +86257,7 @@
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1033"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85781,25 +86265,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1040: ovs-ofctl -O OpenFlow11 mod-flows br0 cookie=0x1/0xff,actions=4"
-at_fn_check_prepare_trace "ofproto.at:1040"
+$as_echo "$at_srcdir/ofproto.at:1081: ovs-ofctl -O OpenFlow11 mod-flows br0 cookie=0x1/0xff,actions=4"
+at_fn_check_prepare_trace "ofproto.at:1081"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 mod-flows br0 cookie=0x1/0xff,actions=4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1040"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1081"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1041: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1041"
+$as_echo "$at_srcdir/ofproto.at:1082: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1082"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -85809,52 +86293,52 @@
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1041"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1082"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1047: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1047"
+$as_echo "$at_srcdir/ofproto.at:1088: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1088"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1047"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1088"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1047: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1047"
+$as_echo "$at_srcdir/ofproto.at:1088: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1088"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1047"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1088"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1047: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1047"
+$as_echo "$at_srcdir/ofproto.at:1088: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1088"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1047"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1088"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85864,13 +86348,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_723
-#AT_START_724
-at_fn_group_banner 724 'ofproto.at:1050' \
+#AT_STOP_725
+#AT_START_726
+at_fn_group_banner 726 'ofproto.at:1091' \
   "ofproto - mod flows based on cookie mask (OpenFlow 1.2)" "" 49
 at_xfail=no
 (
-  $as_echo "724. $at_setup_line: testing $at_desc ..."
+  $as_echo "726. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -85880,29 +86364,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1051: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1051"
+$as_echo "$at_srcdir/ofproto.at:1092: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1092"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1051"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1092"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1051: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1051"
+$as_echo "$at_srcdir/ofproto.at:1092: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1092"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1051"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1092"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -85912,49 +86396,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1051: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1092: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1051"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1092"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1051"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1092"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1051: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1051"
+$as_echo "$at_srcdir/ofproto.at:1092: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1092"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1051"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1092"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1051: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1051"
+$as_echo "$at_srcdir/ofproto.at:1092: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1092"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1051"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1092"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -85966,14 +86450,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1051: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1092: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1051"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1092"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -85981,12 +86465,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1051"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1092"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -85995,15 +86479,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1051: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1051"
+$as_echo "$at_srcdir/ofproto.at:1092: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1092"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1051"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1092"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86011,55 +86495,55 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1052: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1052"
+$as_echo "$at_srcdir/ofproto.at:1093: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1093"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1052"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1093"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1053: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=2,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1053"
+$as_echo "$at_srcdir/ofproto.at:1094: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=2,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1094"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=2,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1053"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1094"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1054: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x2,in_port=3,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1054"
+$as_echo "$at_srcdir/ofproto.at:1095: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x2,in_port=3,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1095"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x2,in_port=3,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1054"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1055: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1055"
+$as_echo "$at_srcdir/ofproto.at:1096: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1096"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -86069,7 +86553,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1055"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86077,25 +86561,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1062: ovs-ofctl -O OpenFlow12 mod-flows br0 cookie=0x1/0xff,actions=4"
-at_fn_check_prepare_trace "ofproto.at:1062"
+$as_echo "$at_srcdir/ofproto.at:1103: ovs-ofctl -O OpenFlow12 mod-flows br0 cookie=0x1/0xff,actions=4"
+at_fn_check_prepare_trace "ofproto.at:1103"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 mod-flows br0 cookie=0x1/0xff,actions=4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1062"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1103"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1063: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1063"
+$as_echo "$at_srcdir/ofproto.at:1104: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1104"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -86105,52 +86589,52 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1063"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1104"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1069: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1069"
+$as_echo "$at_srcdir/ofproto.at:1110: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1110"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1069"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1110"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1069: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1069"
+$as_echo "$at_srcdir/ofproto.at:1110: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1110"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1069"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1110"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1069: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1069"
+$as_echo "$at_srcdir/ofproto.at:1110: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1110"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1069"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1110"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86160,13 +86644,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_724
-#AT_START_725
-at_fn_group_banner 725 'ofproto.at:1073' \
+#AT_STOP_726
+#AT_START_727
+at_fn_group_banner 727 'ofproto.at:1114' \
   "ofproto - mod flows based on cookie mask with cookie change" "" 49
 at_xfail=no
 (
-  $as_echo "725. $at_setup_line: testing $at_desc ..."
+  $as_echo "727. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -86176,29 +86660,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1074: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1074"
+$as_echo "$at_srcdir/ofproto.at:1115: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1115"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1115"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1074: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1074"
+$as_echo "$at_srcdir/ofproto.at:1115: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1115"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1115"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -86208,49 +86692,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1074: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1115: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1074"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1115"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1115"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1074: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1074"
+$as_echo "$at_srcdir/ofproto.at:1115: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1115"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1115"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1074: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1074"
+$as_echo "$at_srcdir/ofproto.at:1115: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1115"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1115"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -86262,14 +86746,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1074: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1115: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1074"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1115"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -86277,12 +86761,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1115"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86291,15 +86775,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1074: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1074"
+$as_echo "$at_srcdir/ofproto.at:1115: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1115"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1115"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86307,55 +86791,55 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1075: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1075"
+$as_echo "$at_srcdir/ofproto.at:1116: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1116"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1075"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1116"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1076: ovs-ofctl add-flow br0 cookie=0x1,in_port=2,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1076"
+$as_echo "$at_srcdir/ofproto.at:1117: ovs-ofctl add-flow br0 cookie=0x1,in_port=2,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1117"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x1,in_port=2,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1076"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1117"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1077: ovs-ofctl add-flow br0 cookie=0x2,in_port=3,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1077"
+$as_echo "$at_srcdir/ofproto.at:1118: ovs-ofctl add-flow br0 cookie=0x2,in_port=3,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1118"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x2,in_port=3,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1077"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1118"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1078: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1078"
+$as_echo "$at_srcdir/ofproto.at:1119: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1119"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -86365,7 +86849,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1078"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1119"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86373,25 +86857,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1085: ovs-ofctl -F nxm mod-flows br0 cookie=1/-1,cookie=4,actions=4"
-at_fn_check_prepare_trace "ofproto.at:1085"
+$as_echo "$at_srcdir/ofproto.at:1126: ovs-ofctl -F nxm mod-flows br0 cookie=1/-1,cookie=4,actions=4"
+at_fn_check_prepare_trace "ofproto.at:1126"
 ( $at_check_trace; ovs-ofctl -F nxm mod-flows br0 cookie=1/-1,cookie=4,actions=4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1085"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1126"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1086: ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1086"
+$as_echo "$at_srcdir/ofproto.at:1127: ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1127"
 ( $at_check_trace; ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -86401,52 +86885,52 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1086"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1127"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1092: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1092"
+$as_echo "$at_srcdir/ofproto.at:1133: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1133"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1092"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1133"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1092: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1092"
+$as_echo "$at_srcdir/ofproto.at:1133: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1133"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1092"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1133"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1092: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1092"
+$as_echo "$at_srcdir/ofproto.at:1133: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1133"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1092"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1133"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86456,13 +86940,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_725
-#AT_START_726
-at_fn_group_banner 726 'ofproto.at:1095' \
+#AT_STOP_727
+#AT_START_728
+at_fn_group_banner 728 'ofproto.at:1136' \
   "ofproto - mod flow with cookie miss (mask==0) - NXM" "" 49
 at_xfail=no
 (
-  $as_echo "726. $at_setup_line: testing $at_desc ..."
+  $as_echo "728. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -86472,29 +86956,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1096: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1096"
+$as_echo "$at_srcdir/ofproto.at:1137: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1137"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1096"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1137"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1096: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1096"
+$as_echo "$at_srcdir/ofproto.at:1137: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1137"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1096"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1137"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -86504,49 +86988,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1096: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1137: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1096"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1137"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1096"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1137"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1096: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1096"
+$as_echo "$at_srcdir/ofproto.at:1137: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1137"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1096"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1137"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1096: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1096"
+$as_echo "$at_srcdir/ofproto.at:1137: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1137"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1096"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1137"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -86558,14 +87042,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1096: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1137: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1096"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1137"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -86573,12 +87057,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1096"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1137"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86587,15 +87071,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1096: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1096"
+$as_echo "$at_srcdir/ofproto.at:1137: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1137"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1096"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1137"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86603,25 +87087,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1097: ovs-ofctl -F nxm mod-flows br0 in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1097"
+$as_echo "$at_srcdir/ofproto.at:1138: ovs-ofctl -F nxm mod-flows br0 in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1138"
 ( $at_check_trace; ovs-ofctl -F nxm mod-flows br0 in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1097"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1138"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1098: ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1098"
+$as_echo "$at_srcdir/ofproto.at:1139: ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1139"
 ( $at_check_trace; ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -86629,52 +87113,52 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1098"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1139"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1102: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1102"
+$as_echo "$at_srcdir/ofproto.at:1143: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1143"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1102"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1143"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1102: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1102"
+$as_echo "$at_srcdir/ofproto.at:1143: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1143"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1102"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1143"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1102: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1102"
+$as_echo "$at_srcdir/ofproto.at:1143: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1143"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1102"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1143"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86684,13 +87168,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_726
-#AT_START_727
-at_fn_group_banner 727 'ofproto.at:1105' \
+#AT_STOP_728
+#AT_START_729
+at_fn_group_banner 729 'ofproto.at:1146' \
   "ofproto - mod flow with cookie miss (mask==0) - OF1.1" "" 49
 at_xfail=no
 (
-  $as_echo "727. $at_setup_line: testing $at_desc ..."
+  $as_echo "729. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -86700,29 +87184,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1106: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1106"
+$as_echo "$at_srcdir/ofproto.at:1147: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1147"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1106"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1147"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1106: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1106"
+$as_echo "$at_srcdir/ofproto.at:1147: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1147"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1106"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1147"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -86732,49 +87216,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1106: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1147: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1106"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1147"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1106"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1147"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1106: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1106"
+$as_echo "$at_srcdir/ofproto.at:1147: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1147"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1106"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1106: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1106"
+$as_echo "$at_srcdir/ofproto.at:1147: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1147"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1106"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -86786,14 +87270,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1106: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1147: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1106"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1147"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -86801,12 +87285,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1106"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86815,15 +87299,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1106: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1106"
+$as_echo "$at_srcdir/ofproto.at:1147: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1147"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1106"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86831,25 +87315,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1107: ovs-ofctl -O openflow11 mod-flows br0 in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1107"
+$as_echo "$at_srcdir/ofproto.at:1148: ovs-ofctl -O openflow11 mod-flows br0 in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1148"
 ( $at_check_trace; ovs-ofctl -O openflow11 mod-flows br0 in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1107"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1108: ovs-ofctl -O openflow11 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1108"
+$as_echo "$at_srcdir/ofproto.at:1149: ovs-ofctl -O openflow11 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1149"
 ( $at_check_trace; ovs-ofctl -O openflow11 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -86857,52 +87341,52 @@
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1108"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1149"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1112: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1112"
+$as_echo "$at_srcdir/ofproto.at:1153: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1153"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1112"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1153"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1112: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1112"
+$as_echo "$at_srcdir/ofproto.at:1153: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1153"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1112"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1153"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1112: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1112"
+$as_echo "$at_srcdir/ofproto.at:1153: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1153"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1112"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1153"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -86912,13 +87396,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_727
-#AT_START_728
-at_fn_group_banner 728 'ofproto.at:1115' \
+#AT_STOP_729
+#AT_START_730
+at_fn_group_banner 730 'ofproto.at:1156' \
   "ofproto - mod flow with cookie miss (mask==0) - OF1.2" "" 49
 at_xfail=no
 (
-  $as_echo "728. $at_setup_line: testing $at_desc ..."
+  $as_echo "730. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -86928,29 +87412,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1116: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1116"
+$as_echo "$at_srcdir/ofproto.at:1157: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1157"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1116"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1157"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1116: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1116"
+$as_echo "$at_srcdir/ofproto.at:1157: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1157"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1116"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1157"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -86960,49 +87444,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1116: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1157: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1116"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1157"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1116"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1157"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1116: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1116"
+$as_echo "$at_srcdir/ofproto.at:1157: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1157"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1116"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1157"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1116: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1116"
+$as_echo "$at_srcdir/ofproto.at:1157: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1157"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1116"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1157"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -87014,14 +87498,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1116: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1157: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1116"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1157"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -87029,12 +87513,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1116"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1157"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87043,15 +87527,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1116: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1116"
+$as_echo "$at_srcdir/ofproto.at:1157: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1157"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1116"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1157"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87059,77 +87543,77 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1117: ovs-ofctl -O openflow12 mod-flows br0 in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1117"
+$as_echo "$at_srcdir/ofproto.at:1158: ovs-ofctl -O openflow12 mod-flows br0 in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1158"
 ( $at_check_trace; ovs-ofctl -O openflow12 mod-flows br0 in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1117"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1158"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1118: ovs-ofctl -O openflow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1118"
+$as_echo "$at_srcdir/ofproto.at:1159: ovs-ofctl -O openflow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1159"
 ( $at_check_trace; ovs-ofctl -O openflow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1118"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1159"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1121: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1121"
+$as_echo "$at_srcdir/ofproto.at:1162: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1162"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1121"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1162"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1121: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1121"
+$as_echo "$at_srcdir/ofproto.at:1162: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1162"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1121"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1162"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1121: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1121"
+$as_echo "$at_srcdir/ofproto.at:1162: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1162"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1121"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1162"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87139,13 +87623,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_728
-#AT_START_729
-at_fn_group_banner 729 'ofproto.at:1124' \
+#AT_STOP_730
+#AT_START_731
+at_fn_group_banner 731 'ofproto.at:1165' \
   "ofproto - mod flow with cookie miss (mask!=0) - NXM" "" 49
 at_xfail=no
 (
-  $as_echo "729. $at_setup_line: testing $at_desc ..."
+  $as_echo "731. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -87155,29 +87639,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1125: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1125"
+$as_echo "$at_srcdir/ofproto.at:1166: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1166"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1125"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1166"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1125: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1125"
+$as_echo "$at_srcdir/ofproto.at:1166: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1166"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1125"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1166"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -87187,49 +87671,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1125: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1166: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1125"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1166"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1125"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1166"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1125: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1125"
+$as_echo "$at_srcdir/ofproto.at:1166: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1166"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1125"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1166"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1125: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1125"
+$as_echo "$at_srcdir/ofproto.at:1166: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1166"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1125"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1166"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -87241,14 +87725,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1125: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1166: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1125"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1166"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -87256,12 +87740,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1125"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1166"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87270,15 +87754,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1125: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1125"
+$as_echo "$at_srcdir/ofproto.at:1166: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1166"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1125"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1166"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87286,77 +87770,77 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1126: ovs-ofctl -F nxm mod-flows br0 cookie=1/1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1126"
+$as_echo "$at_srcdir/ofproto.at:1167: ovs-ofctl -F nxm mod-flows br0 cookie=1/1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1167"
 ( $at_check_trace; ovs-ofctl -F nxm mod-flows br0 cookie=1/1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1126"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1127: ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1127"
+$as_echo "$at_srcdir/ofproto.at:1168: ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1168"
 ( $at_check_trace; ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1127"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1168"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1130: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1130"
+$as_echo "$at_srcdir/ofproto.at:1171: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1171"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1130"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1171"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1130: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1130"
+$as_echo "$at_srcdir/ofproto.at:1171: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1171"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1130"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1171"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1130: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1130"
+$as_echo "$at_srcdir/ofproto.at:1171: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1171"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1130"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1171"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87366,13 +87850,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_729
-#AT_START_730
-at_fn_group_banner 730 'ofproto.at:1133' \
+#AT_STOP_731
+#AT_START_732
+at_fn_group_banner 732 'ofproto.at:1174' \
   "ofproto - mod flow with cookie miss (mask!=0) - OF1.1" "" 49
 at_xfail=no
 (
-  $as_echo "730. $at_setup_line: testing $at_desc ..."
+  $as_echo "732. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -87382,29 +87866,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1134: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1134"
+$as_echo "$at_srcdir/ofproto.at:1175: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1175"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1134"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1175"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1134: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1134"
+$as_echo "$at_srcdir/ofproto.at:1175: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1175"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1134"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1175"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -87414,49 +87898,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1134: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1175: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1134"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1175"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1134"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1175"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1134: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1134"
+$as_echo "$at_srcdir/ofproto.at:1175: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1175"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1134"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1175"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1134: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1134"
+$as_echo "$at_srcdir/ofproto.at:1175: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1175"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1134"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1175"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -87468,14 +87952,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1134: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1175: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1134"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1175"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -87483,12 +87967,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1134"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1175"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87497,15 +87981,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1134: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1134"
+$as_echo "$at_srcdir/ofproto.at:1175: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1175"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1134"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1175"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87513,77 +87997,77 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1135: ovs-ofctl -O openflow11 mod-flows br0 cookie=1/1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1135"
+$as_echo "$at_srcdir/ofproto.at:1176: ovs-ofctl -O openflow11 mod-flows br0 cookie=1/1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1176"
 ( $at_check_trace; ovs-ofctl -O openflow11 mod-flows br0 cookie=1/1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1176"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1136: ovs-ofctl -O openflow11 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1136"
+$as_echo "$at_srcdir/ofproto.at:1177: ovs-ofctl -O openflow11 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1177"
 ( $at_check_trace; ovs-ofctl -O openflow11 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1177"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1139: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1139"
+$as_echo "$at_srcdir/ofproto.at:1180: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1180"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1139"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1180"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1139: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1139"
+$as_echo "$at_srcdir/ofproto.at:1180: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1180"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1139"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1180"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1139: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1139"
+$as_echo "$at_srcdir/ofproto.at:1180: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1180"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1139"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1180"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87593,13 +88077,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_730
-#AT_START_731
-at_fn_group_banner 731 'ofproto.at:1142' \
+#AT_STOP_732
+#AT_START_733
+at_fn_group_banner 733 'ofproto.at:1183' \
   "ofproto - mod flow with cookie miss (mask!=0) - OF1.2" "" 49
 at_xfail=no
 (
-  $as_echo "731. $at_setup_line: testing $at_desc ..."
+  $as_echo "733. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -87609,29 +88093,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1143: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1143"
+$as_echo "$at_srcdir/ofproto.at:1184: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1184"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1143"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1184"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1143: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1143"
+$as_echo "$at_srcdir/ofproto.at:1184: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1184"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1143"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1184"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -87641,49 +88125,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1143: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1184: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1143"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1184"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1143"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1184"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1143: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1143"
+$as_echo "$at_srcdir/ofproto.at:1184: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1184"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1143"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1184"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1143: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1143"
+$as_echo "$at_srcdir/ofproto.at:1184: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1184"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1143"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1184"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -87695,14 +88179,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1143: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1184: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1143"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1184"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -87710,12 +88194,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1143"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1184"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87724,15 +88208,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1143: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1143"
+$as_echo "$at_srcdir/ofproto.at:1184: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1184"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1143"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1184"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87740,77 +88224,77 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1144: ovs-ofctl -O openflow12 mod-flows br0 cookie=1/1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1144"
+$as_echo "$at_srcdir/ofproto.at:1185: ovs-ofctl -O openflow12 mod-flows br0 cookie=1/1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1185"
 ( $at_check_trace; ovs-ofctl -O openflow12 mod-flows br0 cookie=1/1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1144"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1185"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1145: ovs-ofctl -O openflow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1145"
+$as_echo "$at_srcdir/ofproto.at:1186: ovs-ofctl -O openflow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1186"
 ( $at_check_trace; ovs-ofctl -O openflow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1145"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1186"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1148: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1148"
+$as_echo "$at_srcdir/ofproto.at:1189: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1189"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1148"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1189"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1148: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1148"
+$as_echo "$at_srcdir/ofproto.at:1189: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1189"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1148"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1189"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1148: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1148"
+$as_echo "$at_srcdir/ofproto.at:1189: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1189"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1148"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1189"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87820,13 +88304,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_731
-#AT_START_732
-at_fn_group_banner 732 'ofproto.at:1151' \
+#AT_STOP_733
+#AT_START_734
+at_fn_group_banner 734 'ofproto.at:1192' \
   "ofproto - del flows with cookies" "               " 49
 at_xfail=no
 (
-  $as_echo "732. $at_setup_line: testing $at_desc ..."
+  $as_echo "734. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -87836,29 +88320,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1152: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1152"
+$as_echo "$at_srcdir/ofproto.at:1193: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1193"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1152"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1193"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1152: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1152"
+$as_echo "$at_srcdir/ofproto.at:1193: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1193"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1152"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1193"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -87868,49 +88352,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1152: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1193: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1152"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1193"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1152"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1193"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1152: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1152"
+$as_echo "$at_srcdir/ofproto.at:1193: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1193"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1152"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1193"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1152: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1152"
+$as_echo "$at_srcdir/ofproto.at:1193: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1193"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1152"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1193"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -87922,14 +88406,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1152: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1193: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1152"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1193"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -87937,12 +88421,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1152"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1193"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87951,15 +88435,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1152: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1152"
+$as_echo "$at_srcdir/ofproto.at:1193: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1193"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1152"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1193"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -87967,55 +88451,55 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1153: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1153"
+$as_echo "$at_srcdir/ofproto.at:1194: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1194"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1153"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1194"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1154: ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1154"
+$as_echo "$at_srcdir/ofproto.at:1195: ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1195"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1154"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1195"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1155: ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1155"
+$as_echo "$at_srcdir/ofproto.at:1196: ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1196"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1155"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1196"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1156: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1156"
+$as_echo "$at_srcdir/ofproto.at:1197: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1197"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -88025,7 +88509,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1156"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1197"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -88033,77 +88517,77 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1163: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "ofproto.at:1163"
+$as_echo "$at_srcdir/ofproto.at:1204: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "ofproto.at:1204"
 ( $at_check_trace; ovs-ofctl del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1163"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1204"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1164: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1164"
+$as_echo "$at_srcdir/ofproto.at:1205: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1205"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1164"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1205"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1167: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1167"
+$as_echo "$at_srcdir/ofproto.at:1208: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1208"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1167"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1167: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1167"
+$as_echo "$at_srcdir/ofproto.at:1208: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1208"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1167"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1167: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1167"
+$as_echo "$at_srcdir/ofproto.at:1208: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1208"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1167"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -88113,13 +88597,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_732
-#AT_START_733
-at_fn_group_banner 733 'ofproto.at:1170' \
+#AT_STOP_734
+#AT_START_735
+at_fn_group_banner 735 'ofproto.at:1211' \
   "ofproto - del flows based on cookie" "            " 49
 at_xfail=no
 (
-  $as_echo "733. $at_setup_line: testing $at_desc ..."
+  $as_echo "735. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -88129,29 +88613,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1171: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1171"
+$as_echo "$at_srcdir/ofproto.at:1212: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1212"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1171"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1212"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1171: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1171"
+$as_echo "$at_srcdir/ofproto.at:1212: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1212"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1171"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1212"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -88161,49 +88645,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1171: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1212: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1171"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1212"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1171"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1212"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1171: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1171"
+$as_echo "$at_srcdir/ofproto.at:1212: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1212"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1171"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1212"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1171: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1171"
+$as_echo "$at_srcdir/ofproto.at:1212: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1212"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1171"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1212"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -88215,14 +88699,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1171: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1212: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1171"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1212"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -88230,12 +88714,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1171"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1212"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -88244,15 +88728,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1171: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1171"
+$as_echo "$at_srcdir/ofproto.at:1212: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1212"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1171"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1212"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -88260,55 +88744,55 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1172: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1172"
+$as_echo "$at_srcdir/ofproto.at:1213: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1213"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1172"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1213"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1173: ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1173"
+$as_echo "$at_srcdir/ofproto.at:1214: ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1214"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1173"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1214"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1174: ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1174"
+$as_echo "$at_srcdir/ofproto.at:1215: ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1215"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1174"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1215"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1175: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1175"
+$as_echo "$at_srcdir/ofproto.at:1216: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1216"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -88318,7 +88802,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1175"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1216"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -88326,25 +88810,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1182: ovs-ofctl del-flows br0 cookie=0x3/-1"
-at_fn_check_prepare_trace "ofproto.at:1182"
+$as_echo "$at_srcdir/ofproto.at:1223: ovs-ofctl del-flows br0 cookie=0x3/-1"
+at_fn_check_prepare_trace "ofproto.at:1223"
 ( $at_check_trace; ovs-ofctl del-flows br0 cookie=0x3/-1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1182"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1223"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1183: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1183"
+$as_echo "$at_srcdir/ofproto.at:1224: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1224"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -88353,52 +88837,52 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1183"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1224"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1188: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1188"
+$as_echo "$at_srcdir/ofproto.at:1229: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1229"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1188"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1229"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1188: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1188"
+$as_echo "$at_srcdir/ofproto.at:1229: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1229"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1188"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1229"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1188: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1188"
+$as_echo "$at_srcdir/ofproto.at:1229: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1229"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1188"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1229"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -88408,13 +88892,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_733
-#AT_START_734
-at_fn_group_banner 734 'ofproto.at:1191' \
+#AT_STOP_735
+#AT_START_736
+at_fn_group_banner 736 'ofproto.at:1232' \
   "ofproto - del flows based on cookie mask" "       " 49
 at_xfail=no
 (
-  $as_echo "734. $at_setup_line: testing $at_desc ..."
+  $as_echo "736. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -88424,29 +88908,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1192: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1192"
+$as_echo "$at_srcdir/ofproto.at:1233: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1233"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1192"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1233"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1192: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1192"
+$as_echo "$at_srcdir/ofproto.at:1233: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1233"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1192"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1233"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -88456,49 +88940,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1192: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1233: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1192"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1233"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1192"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1233"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1192: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1192"
+$as_echo "$at_srcdir/ofproto.at:1233: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1233"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1192"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1192: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1192"
+$as_echo "$at_srcdir/ofproto.at:1233: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1233"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1192"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -88510,14 +88994,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1192: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1233: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1192"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1233"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -88525,12 +89009,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1192"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -88539,15 +89023,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1192: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1192"
+$as_echo "$at_srcdir/ofproto.at:1233: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1233"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1192"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -88555,55 +89039,55 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1193: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1193"
+$as_echo "$at_srcdir/ofproto.at:1234: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1234"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1193"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1194: ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1194"
+$as_echo "$at_srcdir/ofproto.at:1235: ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1235"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1194"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1235"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1195: ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1195"
+$as_echo "$at_srcdir/ofproto.at:1236: ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1236"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1195"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1196: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1196"
+$as_echo "$at_srcdir/ofproto.at:1237: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1237"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -88613,32 +89097,32 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1196"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1237"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1202: ovs-ofctl del-flows br0 cookie=0x3/0x1"
-at_fn_check_prepare_trace "ofproto.at:1202"
+$as_echo "$at_srcdir/ofproto.at:1243: ovs-ofctl del-flows br0 cookie=0x3/0x1"
+at_fn_check_prepare_trace "ofproto.at:1243"
 ( $at_check_trace; ovs-ofctl del-flows br0 cookie=0x3/0x1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1202"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1243"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1203: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1203"
+$as_echo "$at_srcdir/ofproto.at:1244: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1244"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -88646,52 +89130,52 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1203"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1244"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1207: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1207"
+$as_echo "$at_srcdir/ofproto.at:1248: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1248"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1207"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1248"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1207: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1207"
+$as_echo "$at_srcdir/ofproto.at:1248: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1248"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1207"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1248"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1207: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1207"
+$as_echo "$at_srcdir/ofproto.at:1248: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1248"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1207"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1248"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -88701,13 +89185,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_734
-#AT_START_735
-at_fn_group_banner 735 'ofproto.at:1210' \
+#AT_STOP_736
+#AT_START_737
+at_fn_group_banner 737 'ofproto.at:1251' \
   "ofproto - del flows based on table id (NXM)" "    " 49
 at_xfail=no
 (
-  $as_echo "735. $at_setup_line: testing $at_desc ..."
+  $as_echo "737. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -88717,29 +89201,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1211: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1211"
+$as_echo "$at_srcdir/ofproto.at:1252: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1252"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1211"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1252"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1211: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1211"
+$as_echo "$at_srcdir/ofproto.at:1252: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1252"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1211"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1252"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -88749,49 +89233,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1211: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1252: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1211"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1252"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1211"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1252"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1211: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1211"
+$as_echo "$at_srcdir/ofproto.at:1252: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1252"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1211"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1252"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1211: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1211"
+$as_echo "$at_srcdir/ofproto.at:1252: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1252"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1211"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1252"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -88803,14 +89287,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1211: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1252: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1211"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1252"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -88818,12 +89302,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1211"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1252"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -88832,15 +89316,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1211: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1211"
+$as_echo "$at_srcdir/ofproto.at:1252: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1252"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1211"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1252"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -88848,40 +89332,40 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1212: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1212"
+$as_echo "$at_srcdir/ofproto.at:1253: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1253"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1253"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1213: ovs-ofctl add-flow br0 cookie=0x2,in_port=2,table=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1213"
+$as_echo "$at_srcdir/ofproto.at:1254: ovs-ofctl add-flow br0 cookie=0x2,in_port=2,table=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1254"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x2,in_port=2,table=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1213"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1254"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1214: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1214"
+$as_echo "$at_srcdir/ofproto.at:1255: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1255"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -88890,32 +89374,32 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1214"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1255"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1219: ovs-ofctl del-flows br0 table=0"
-at_fn_check_prepare_trace "ofproto.at:1219"
+$as_echo "$at_srcdir/ofproto.at:1260: ovs-ofctl del-flows br0 table=0"
+at_fn_check_prepare_trace "ofproto.at:1260"
 ( $at_check_trace; ovs-ofctl del-flows br0 table=0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1260"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1220: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1220"
+$as_echo "$at_srcdir/ofproto.at:1261: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1261"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -88923,79 +89407,79 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1261"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1224: ovs-ofctl del-flows br0 table=1"
-at_fn_check_prepare_trace "ofproto.at:1224"
+$as_echo "$at_srcdir/ofproto.at:1265: ovs-ofctl del-flows br0 table=1"
+at_fn_check_prepare_trace "ofproto.at:1265"
 ( $at_check_trace; ovs-ofctl del-flows br0 table=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1224"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1265"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1225: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1225"
+$as_echo "$at_srcdir/ofproto.at:1266: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1266"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1225"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1228: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1228"
+$as_echo "$at_srcdir/ofproto.at:1269: ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1269"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1228"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1269"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1229: ovs-ofctl add-flow br0 cookie=0x2,in_port=2,table=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1229"
+$as_echo "$at_srcdir/ofproto.at:1270: ovs-ofctl add-flow br0 cookie=0x2,in_port=2,table=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1270"
 ( $at_check_trace; ovs-ofctl add-flow br0 cookie=0x2,in_port=2,table=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1229"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1270"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1230: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1230"
+$as_echo "$at_srcdir/ofproto.at:1271: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1271"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -89004,84 +89488,84 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1230"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1235: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "ofproto.at:1235"
+$as_echo "$at_srcdir/ofproto.at:1276: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "ofproto.at:1276"
 ( $at_check_trace; ovs-ofctl del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1235"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1236: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1236"
+$as_echo "$at_srcdir/ofproto.at:1277: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1277"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1236"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1239: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1239"
+$as_echo "$at_srcdir/ofproto.at:1280: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1280"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1239"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1280"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1239: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1239"
+$as_echo "$at_srcdir/ofproto.at:1280: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1280"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1239"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1280"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1239: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1239"
+$as_echo "$at_srcdir/ofproto.at:1280: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1280"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1239"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1280"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89091,13 +89575,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_735
-#AT_START_736
-at_fn_group_banner 736 'ofproto.at:1242' \
+#AT_STOP_737
+#AT_START_738
+at_fn_group_banner 738 'ofproto.at:1283' \
   "ofproto - del flows based on table id (OpenFlow 1.1)" "" 49
 at_xfail=no
 (
-  $as_echo "736. $at_setup_line: testing $at_desc ..."
+  $as_echo "738. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -89107,29 +89591,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1243: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1243"
+$as_echo "$at_srcdir/ofproto.at:1284: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1284"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1284"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1243: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1243"
+$as_echo "$at_srcdir/ofproto.at:1284: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1284"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1284"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -89139,49 +89623,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1243: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1284: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1243"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1284"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1284"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1243: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1243"
+$as_echo "$at_srcdir/ofproto.at:1284: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1284"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1284"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1243: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1243"
+$as_echo "$at_srcdir/ofproto.at:1284: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1284"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1284"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -89193,14 +89677,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1243: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1284: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1243"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1284"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -89208,12 +89692,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1284"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89222,15 +89706,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1243: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1243"
+$as_echo "$at_srcdir/ofproto.at:1284: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1284"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1284"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89238,40 +89722,40 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1244: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1244"
+$as_echo "$at_srcdir/ofproto.at:1285: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1285"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1244"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1285"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1245: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x2,in_port=2,table=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1245"
+$as_echo "$at_srcdir/ofproto.at:1286: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x2,in_port=2,table=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1286"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x2,in_port=2,table=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1245"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1286"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1246: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1246"
+$as_echo "$at_srcdir/ofproto.at:1287: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1287"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -89280,32 +89764,32 @@
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1246"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1287"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1251: ovs-ofctl -O OpenFlow11 del-flows br0 table=0"
-at_fn_check_prepare_trace "ofproto.at:1251"
+$as_echo "$at_srcdir/ofproto.at:1292: ovs-ofctl -O OpenFlow11 del-flows br0 table=0"
+at_fn_check_prepare_trace "ofproto.at:1292"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 del-flows br0 table=0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1251"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1292"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1252: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1252"
+$as_echo "$at_srcdir/ofproto.at:1293: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1293"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -89313,79 +89797,79 @@
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1252"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1293"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1256: ovs-ofctl -O OpenFlow11 del-flows br0 table=1"
-at_fn_check_prepare_trace "ofproto.at:1256"
+$as_echo "$at_srcdir/ofproto.at:1297: ovs-ofctl -O OpenFlow11 del-flows br0 table=1"
+at_fn_check_prepare_trace "ofproto.at:1297"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 del-flows br0 table=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1256"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1297"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1257: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1257"
+$as_echo "$at_srcdir/ofproto.at:1298: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1298"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1257"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1298"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1260: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1260"
+$as_echo "$at_srcdir/ofproto.at:1301: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1301"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1260"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1261: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x2,in_port=2,table=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1261"
+$as_echo "$at_srcdir/ofproto.at:1302: ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x2,in_port=2,table=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1302"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 cookie=0x2,in_port=2,table=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1261"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1302"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1262: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1262"
+$as_echo "$at_srcdir/ofproto.at:1303: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1303"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -89394,32 +89878,32 @@
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1262"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1303"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1267: ovs-ofctl -O OpenFlow11 del-flows br0"
-at_fn_check_prepare_trace "ofproto.at:1267"
+$as_echo "$at_srcdir/ofproto.at:1308: ovs-ofctl -O OpenFlow11 del-flows br0"
+at_fn_check_prepare_trace "ofproto.at:1308"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1267"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1308"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1268: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1268"
+$as_echo "$at_srcdir/ofproto.at:1309: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1309"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -89427,52 +89911,52 @@
  cookie=0x2, table=1, in_port=2 actions=output:1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1268"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1309"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1272: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1272"
+$as_echo "$at_srcdir/ofproto.at:1313: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1313"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1272"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1313"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1272: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1272"
+$as_echo "$at_srcdir/ofproto.at:1313: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1313"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1272"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1313"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1272: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1272"
+$as_echo "$at_srcdir/ofproto.at:1313: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1313"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1272"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1313"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89482,13 +89966,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_736
-#AT_START_737
-at_fn_group_banner 737 'ofproto.at:1275' \
+#AT_STOP_738
+#AT_START_739
+at_fn_group_banner 739 'ofproto.at:1316' \
   "ofproto - del flows based on table id (OpenFlow 1.2)" "" 49
 at_xfail=no
 (
-  $as_echo "737. $at_setup_line: testing $at_desc ..."
+  $as_echo "739. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -89498,29 +89982,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1276: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1276"
+$as_echo "$at_srcdir/ofproto.at:1317: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1317"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1276"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1317"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1276: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1276"
+$as_echo "$at_srcdir/ofproto.at:1317: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1317"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1276"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1317"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -89530,49 +90014,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1276: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1317: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1276"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1317"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1276"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1317"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1276: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1276"
+$as_echo "$at_srcdir/ofproto.at:1317: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1317"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1276"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1317"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1276: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1276"
+$as_echo "$at_srcdir/ofproto.at:1317: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1317"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1276"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1317"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -89584,14 +90068,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1276: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1317: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1276"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1317"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -89599,12 +90083,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1276"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1317"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89613,15 +90097,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1276: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1276"
+$as_echo "$at_srcdir/ofproto.at:1317: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1317"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1276"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1317"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89629,40 +90113,40 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1277: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1277"
+$as_echo "$at_srcdir/ofproto.at:1318: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1318"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1277"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1318"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1278: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x2,in_port=2,table=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1278"
+$as_echo "$at_srcdir/ofproto.at:1319: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x2,in_port=2,table=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1319"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x2,in_port=2,table=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1278"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1319"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1279: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1279"
+$as_echo "$at_srcdir/ofproto.at:1320: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1320"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -89671,32 +90155,32 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1279"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1320"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1284: ovs-ofctl -O OpenFlow12 del-flows br0 table=0"
-at_fn_check_prepare_trace "ofproto.at:1284"
+$as_echo "$at_srcdir/ofproto.at:1325: ovs-ofctl -O OpenFlow12 del-flows br0 table=0"
+at_fn_check_prepare_trace "ofproto.at:1325"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 del-flows br0 table=0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1284"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1325"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1285: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1285"
+$as_echo "$at_srcdir/ofproto.at:1326: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1326"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -89704,79 +90188,79 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1285"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1326"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1289: ovs-ofctl -O OpenFlow12 del-flows br0 table=1"
-at_fn_check_prepare_trace "ofproto.at:1289"
+$as_echo "$at_srcdir/ofproto.at:1330: ovs-ofctl -O OpenFlow12 del-flows br0 table=1"
+at_fn_check_prepare_trace "ofproto.at:1330"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 del-flows br0 table=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1289"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1330"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1290: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1290"
+$as_echo "$at_srcdir/ofproto.at:1331: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1331"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1290"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1331"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1293: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1293"
+$as_echo "$at_srcdir/ofproto.at:1334: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1334"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x1,in_port=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1293"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1334"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1294: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x2,in_port=2,table=1,actions=1"
-at_fn_check_prepare_trace "ofproto.at:1294"
+$as_echo "$at_srcdir/ofproto.at:1335: ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x2,in_port=2,table=1,actions=1"
+at_fn_check_prepare_trace "ofproto.at:1335"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 cookie=0x2,in_port=2,table=1,actions=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1294"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1335"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1295: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1295"
+$as_echo "$at_srcdir/ofproto.at:1336: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1336"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -89785,84 +90269,84 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1295"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1336"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1300: ovs-ofctl -O OpenFlow12 del-flows br0"
-at_fn_check_prepare_trace "ofproto.at:1300"
+$as_echo "$at_srcdir/ofproto.at:1341: ovs-ofctl -O OpenFlow12 del-flows br0"
+at_fn_check_prepare_trace "ofproto.at:1341"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1300"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1341"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1301: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1301"
+$as_echo "$at_srcdir/ofproto.at:1342: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1342"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1301"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1342"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1304: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1304"
+$as_echo "$at_srcdir/ofproto.at:1345: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1345"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1304"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1345"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1304: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1304"
+$as_echo "$at_srcdir/ofproto.at:1345: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1345"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1304"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1345"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1304: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1304"
+$as_echo "$at_srcdir/ofproto.at:1345: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1345"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1304"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1345"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89872,13 +90356,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_737
-#AT_START_738
-at_fn_group_banner 738 'ofproto.at:1307' \
+#AT_STOP_739
+#AT_START_740
+at_fn_group_banner 740 'ofproto.at:1348' \
   "ofproto - flow table configuration (OpenFlow 1.0)" "" 49
 at_xfail=no
 (
-  $as_echo "738. $at_setup_line: testing $at_desc ..."
+  $as_echo "740. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -89888,29 +90372,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1308: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1308"
+$as_echo "$at_srcdir/ofproto.at:1349: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1349"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1308"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1349"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1308: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1308"
+$as_echo "$at_srcdir/ofproto.at:1349: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1349"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1308"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1349"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -89920,49 +90404,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1308: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1349: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1308"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1349"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1308"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1349"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1308: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1308"
+$as_echo "$at_srcdir/ofproto.at:1349: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1349"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1308"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1349"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1308: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1308"
+$as_echo "$at_srcdir/ofproto.at:1349: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1349"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1308"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1349"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -89974,14 +90458,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1308: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1349: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1308"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1349"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -89989,12 +90473,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1308"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1349"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90003,15 +90487,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1308: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1308"
+$as_echo "$at_srcdir/ofproto.at:1349: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1349"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1308"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1349"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90045,15 +90529,15 @@
    name=table$x
  done) > expout
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1335: ovs-ofctl dump-tables br0"
-at_fn_check_prepare_trace "ofproto.at:1335"
+$as_echo "$at_srcdir/ofproto.at:1376: ovs-ofctl dump-tables br0"
+at_fn_check_prepare_trace "ofproto.at:1376"
 ( $at_check_trace; ovs-ofctl dump-tables br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1335"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1376"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90061,18 +90545,18 @@
 
 # Change the configuration.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1337: ovs-vsctl \\
+$as_echo "$at_srcdir/ofproto.at:1378: ovs-vsctl \\
      -- --id=@t0 create Flow_Table name=main \\
      -- --id=@t1 create Flow_Table flow-limit=1024 \\
      -- set bridge br0 'flow_tables={1=@t1,0=@t0}' \\
    | \${PERL} \$srcdir/uuidfilt.pl"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1337"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1378"
 ( $at_check_trace; ovs-vsctl \
      -- --id=@t0 create Flow_Table name=main \
      -- --id=@t1 create Flow_Table flow-limit=1024 \
      -- set bridge br0 'flow_tables={1=@t1,0=@t0}' \
    | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -90080,7 +90564,7 @@
 <1>
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1337"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1378"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90091,60 +90575,60 @@
 sed -e 's/classifier/main/
 21s/1000000/1024/' orig-expout > expout
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1350: ovs-ofctl dump-tables br0"
-at_fn_check_prepare_trace "ofproto.at:1350"
+$as_echo "$at_srcdir/ofproto.at:1391: ovs-ofctl dump-tables br0"
+at_fn_check_prepare_trace "ofproto.at:1391"
 ( $at_check_trace; ovs-ofctl dump-tables br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1350"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1391"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1351: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1351"
+$as_echo "$at_srcdir/ofproto.at:1392: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1392"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1351"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1392"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1351: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1351"
+$as_echo "$at_srcdir/ofproto.at:1392: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1392"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1351"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1392"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1351: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1351"
+$as_echo "$at_srcdir/ofproto.at:1392: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1392"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1351"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1392"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90154,13 +90638,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_738
-#AT_START_739
-at_fn_group_banner 739 'ofproto.at:1357' \
+#AT_STOP_740
+#AT_START_741
+at_fn_group_banner 741 'ofproto.at:1398' \
   "ofproto - hidden rules not in table stats" "      " 49
 at_xfail=no
 (
-  $as_echo "739. $at_setup_line: testing $at_desc ..."
+  $as_echo "741. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # Use an IP address for a controller that won't actually exist: we
@@ -90174,29 +90658,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1362: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1362"
+$as_echo "$at_srcdir/ofproto.at:1403: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1403"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1362"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1403"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1362: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1362"
+$as_echo "$at_srcdir/ofproto.at:1403: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1403"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1362"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1403"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -90206,49 +90690,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1362: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1403: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1362"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1403"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1362"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1403"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1362: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1362"
+$as_echo "$at_srcdir/ofproto.at:1403: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1403"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1362"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1403"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1362: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1362"
+$as_echo "$at_srcdir/ofproto.at:1403: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1403"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1362"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1403"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -90260,14 +90744,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1362: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1403: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1362"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1403"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -90275,12 +90759,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1362"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1403"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90289,15 +90773,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1362: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set-controller br0 tcp:240.0.0.1:6653 "
-at_fn_check_prepare_trace "ofproto.at:1362"
+$as_echo "$at_srcdir/ofproto.at:1403: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set-controller br0 tcp:240.0.0.1:6653 "
+at_fn_check_prepare_trace "ofproto.at:1403"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set-controller br0 tcp:240.0.0.1:6653
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1362"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1403"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90308,17 +90792,17 @@
 
 # Check that no hidden flows are visible in OpenFlow.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1366: ovs-ofctl dump-flows br0"
-at_fn_check_prepare_trace "ofproto.at:1366"
+$as_echo "$at_srcdir/ofproto.at:1407: ovs-ofctl dump-flows br0"
+at_fn_check_prepare_trace "ofproto.at:1407"
 ( $at_check_trace; ovs-ofctl dump-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_FLOW reply (xid=0x4):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1366"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1407"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90330,30 +90814,30 @@
 # We discard flows that mention table_id because we only want table 0 flows,
 # which in OVS is implied by the absence of a table_id.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1373: ovs-appctl bridge/dump-flows br0"
-at_fn_check_prepare_trace "ofproto.at:1373"
+$as_echo "$at_srcdir/ofproto.at:1414: ovs-appctl bridge/dump-flows br0"
+at_fn_check_prepare_trace "ofproto.at:1414"
 ( $at_check_trace; ovs-appctl bridge/dump-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1373"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1414"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1374: test \`grep '240\\.0\\.0\\.1' stdout | grep -v table_id= | wc -l\` -gt 0"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto.at:1374"
+$as_echo "$at_srcdir/ofproto.at:1415: test \`grep '240\\.0\\.0\\.1' stdout | grep -v table_id= | wc -l\` -gt 0"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto.at:1415"
 ( $at_check_trace; test `grep '240\.0\.0\.1' stdout | grep -v table_id= | wc -l` -gt 0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1374"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1415"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90387,60 +90871,60 @@
    name=table$x
  done) > expout
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1402: ovs-ofctl dump-tables br0"
-at_fn_check_prepare_trace "ofproto.at:1402"
+$as_echo "$at_srcdir/ofproto.at:1443: ovs-ofctl dump-tables br0"
+at_fn_check_prepare_trace "ofproto.at:1443"
 ( $at_check_trace; ovs-ofctl dump-tables br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1402"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1443"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1403: check_logs \"/cannot find route for controller/d\""
-at_fn_check_prepare_trace "ofproto.at:1403"
-( $at_check_trace; check_logs "/cannot find route for controller/d"
-) >>"$at_stdout" 2>>"$at_stderr"
+$as_echo "$at_srcdir/ofproto.at:1444: check_logs \"/240\\.0\\.0\\.1/d\""
+at_fn_check_prepare_trace "ofproto.at:1444"
+( $at_check_trace; check_logs "/240\.0\.0\.1/d"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1444"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1403: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1403"
+$as_echo "$at_srcdir/ofproto.at:1444: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1444"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1444"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1403: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1403"
+$as_echo "$at_srcdir/ofproto.at:1444: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1444"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1444"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90450,13 +90934,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_739
-#AT_START_740
-at_fn_group_banner 740 'ofproto.at:1406' \
+#AT_STOP_741
+#AT_START_742
+at_fn_group_banner 742 'ofproto.at:1447' \
   "ofproto - flow table configuration (OpenFlow 1.2)" "" 49
 at_xfail=no
 (
-  $as_echo "740. $at_setup_line: testing $at_desc ..."
+  $as_echo "742. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -90466,29 +90950,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1407: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1407"
+$as_echo "$at_srcdir/ofproto.at:1448: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1448"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1448"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1407: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1407"
+$as_echo "$at_srcdir/ofproto.at:1448: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1448"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1448"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -90498,49 +90982,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1407: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1448: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1407"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1448"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1448"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1407: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1407"
+$as_echo "$at_srcdir/ofproto.at:1448: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1448"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1448"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1407: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1407"
+$as_echo "$at_srcdir/ofproto.at:1448: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1448"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1448"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -90552,14 +91036,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1407: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1448: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1407"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1448"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -90567,12 +91051,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1448"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90581,15 +91065,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1407: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1407"
+$as_echo "$at_srcdir/ofproto.at:1448: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1448"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1448"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90657,15 +91141,15 @@
    name=table$x
  done) > expout
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1468: ovs-ofctl -O OpenFlow12 dump-tables br0"
-at_fn_check_prepare_trace "ofproto.at:1468"
+$as_echo "$at_srcdir/ofproto.at:1509: ovs-ofctl -O OpenFlow12 dump-tables br0"
+at_fn_check_prepare_trace "ofproto.at:1509"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-tables br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1468"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1509"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90673,18 +91157,18 @@
 
 # Change the configuration.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1470: ovs-vsctl \\
+$as_echo "$at_srcdir/ofproto.at:1511: ovs-vsctl \\
      -- --id=@t0 create Flow_Table name=main \\
      -- --id=@t1 create Flow_Table flow-limit=1024 \\
      -- set bridge br0 'flow_tables={1=@t1,0=@t0}' \\
    | \${PERL} \$srcdir/uuidfilt.pl"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1470"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1511"
 ( $at_check_trace; ovs-vsctl \
      -- --id=@t0 create Flow_Table name=main \
      -- --id=@t1 create Flow_Table flow-limit=1024 \
      -- set bridge br0 'flow_tables={1=@t1,0=@t0}' \
    | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -90692,7 +91176,7 @@
 <1>
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1470"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1511"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90703,60 +91187,60 @@
 sed 's/classifier/main/
 53s/1000000/1024/' < orig-expout > expout
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1483: ovs-ofctl -O OpenFlow12 dump-tables br0"
-at_fn_check_prepare_trace "ofproto.at:1483"
+$as_echo "$at_srcdir/ofproto.at:1524: ovs-ofctl -O OpenFlow12 dump-tables br0"
+at_fn_check_prepare_trace "ofproto.at:1524"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-tables br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1483"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1524"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1484: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1484"
+$as_echo "$at_srcdir/ofproto.at:1525: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1525"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1484"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1525"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1484: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1484"
+$as_echo "$at_srcdir/ofproto.at:1525: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1525"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1484"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1525"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1484: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1484"
+$as_echo "$at_srcdir/ofproto.at:1525: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1525"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1484"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1525"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90766,13 +91250,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_740
-#AT_START_741
-at_fn_group_banner 741 'ofproto.at:1487' \
+#AT_STOP_742
+#AT_START_743
+at_fn_group_banner 743 'ofproto.at:1528' \
   "ofproto - table features (OpenFlow 1.3)" "        " 49
 at_xfail=no
 (
-  $as_echo "741. $at_setup_line: testing $at_desc ..."
+  $as_echo "743. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -90782,29 +91266,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1488: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1488"
+$as_echo "$at_srcdir/ofproto.at:1529: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1529"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1488"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1529"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1488: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1488"
+$as_echo "$at_srcdir/ofproto.at:1529: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1529"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1488"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1529"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -90814,49 +91298,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1488: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1529: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1488"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1529"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1488"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1529"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1488: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1488"
+$as_echo "$at_srcdir/ofproto.at:1529: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1529"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1488"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1529"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1488: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1488"
+$as_echo "$at_srcdir/ofproto.at:1529: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1529"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1488"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1529"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -90868,14 +91352,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1488: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1529: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1488"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1529"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -90883,12 +91367,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1488"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1529"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90897,15 +91381,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1488: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1488"
+$as_echo "$at_srcdir/ofproto.at:1529: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1529"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1488"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1529"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91006,17 +91490,17 @@
    name=table$x
  done) > expout
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1582: ovs-ofctl -O OpenFlow13 dump-table-features br0 | sed '/^\$/d
+$as_echo "$at_srcdir/ofproto.at:1623: ovs-ofctl -O OpenFlow13 dump-table-features br0 | sed '/^\$/d
 /^OFPST_TABLE_FEATURES/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1582"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1623"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 dump-table-features br0 | sed '/^$/d
 /^OFPST_TABLE_FEATURES/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1582"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1623"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91024,18 +91508,18 @@
 
 # Change the configuration.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1585: ovs-vsctl \\
+$as_echo "$at_srcdir/ofproto.at:1626: ovs-vsctl \\
      -- --id=@t0 create Flow_Table name=main \\
      -- --id=@t1 create Flow_Table flow-limit=1024 \\
      -- set bridge br0 'flow_tables={1=@t1,0=@t0}' \\
    | \${PERL} \$srcdir/uuidfilt.pl"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1585"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1626"
 ( $at_check_trace; ovs-vsctl \
      -- --id=@t0 create Flow_Table name=main \
      -- --id=@t1 create Flow_Table flow-limit=1024 \
      -- set bridge br0 'flow_tables={1=@t1,0=@t0}' \
    | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -91043,7 +91527,7 @@
 <1>
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1585"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1626"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91054,62 +91538,62 @@
 sed 's/classifier/main/
 77s/1000000/1024/' < orig-expout > expout
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1598: ovs-ofctl -O OpenFlow13 dump-table-features br0 | sed '/^\$/d
+$as_echo "$at_srcdir/ofproto.at:1639: ovs-ofctl -O OpenFlow13 dump-table-features br0 | sed '/^\$/d
 /^OFPST_TABLE_FEATURES/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1598"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1639"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 dump-table-features br0 | sed '/^$/d
 /^OFPST_TABLE_FEATURES/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1598"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1639"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1600: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1600"
+$as_echo "$at_srcdir/ofproto.at:1641: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1641"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1600"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1641"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1600: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1600"
+$as_echo "$at_srcdir/ofproto.at:1641: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1641"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1600"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1641"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1600: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1600"
+$as_echo "$at_srcdir/ofproto.at:1641: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1641"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1600"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1641"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91119,13 +91603,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_741
-#AT_START_742
-at_fn_group_banner 742 'ofproto.at:1603' \
+#AT_STOP_743
+#AT_START_744
+at_fn_group_banner 744 'ofproto.at:1644' \
   "ofproto - hard limits on flow table size (OpenFlow 1.0)" "" 49
 at_xfail=no
 (
-  $as_echo "742. $at_setup_line: testing $at_desc ..."
+  $as_echo "744. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -91135,29 +91619,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1604: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1604"
+$as_echo "$at_srcdir/ofproto.at:1645: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1645"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1604"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1645"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1604: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1604"
+$as_echo "$at_srcdir/ofproto.at:1645: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1645"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1604"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1645"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -91167,49 +91651,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1604: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1645: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1604"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1645"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1604"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1645"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1604: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1604"
+$as_echo "$at_srcdir/ofproto.at:1645: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1645"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1604"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1645"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1604: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1604"
+$as_echo "$at_srcdir/ofproto.at:1645: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1645"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1604"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1645"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -91221,14 +91705,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1604: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1645: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1604"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1645"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -91236,12 +91720,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1604"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1645"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91250,15 +91734,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1604: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1604"
+$as_echo "$at_srcdir/ofproto.at:1645: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1645"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1604"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1645"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91267,23 +91751,23 @@
 
 # Configure a maximum of 4 flows.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1606: ovs-vsctl \\
+$as_echo "$at_srcdir/ofproto.at:1647: ovs-vsctl \\
      -- --id=@t0 create Flow_Table flow-limit=4 \\
      -- set bridge br0 flow_tables:0=@t0 \\
    | \${PERL} \$srcdir/uuidfilt.pl"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1606"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1647"
 ( $at_check_trace; ovs-vsctl \
      -- --id=@t0 create Flow_Table flow-limit=4 \
      -- set bridge br0 flow_tables:0=@t0 \
    | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "<0>
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1606"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1647"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91294,10 +91778,10 @@
     ovs-ofctl add-flow br0 in_port=$in_port,actions=drop
 done
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1617: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1617"
+$as_echo "$at_srcdir/ofproto.at:1658: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1658"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -91308,7 +91792,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1617"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1658"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91316,32 +91800,32 @@
 
 # Adding another flow will be refused.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1625: ovs-ofctl add-flow br0 in_port=5,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1625"
+$as_echo "$at_srcdir/ofproto.at:1666: ovs-ofctl add-flow br0 in_port=5,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:1666"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=5,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:1625"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:1666"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1626: head -n 1 stderr | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1626"
+$as_echo "$at_srcdir/ofproto.at:1667: head -n 1 stderr | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1667"
 ( $at_check_trace; head -n 1 stderr | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPT_ERROR: OFPFMFC_TABLE_FULL
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1626"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1667"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91349,32 +91833,32 @@
 
 # Also a mod-flow that would add a flow will be refused.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1630: ovs-ofctl mod-flows br0 in_port=5,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1630"
+$as_echo "$at_srcdir/ofproto.at:1671: ovs-ofctl mod-flows br0 in_port=5,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:1671"
 ( $at_check_trace; ovs-ofctl mod-flows br0 in_port=5,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:1630"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:1671"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1631: head -n 1 stderr | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1631"
+$as_echo "$at_srcdir/ofproto.at:1672: head -n 1 stderr | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1672"
 ( $at_check_trace; head -n 1 stderr | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPT_ERROR: OFPFMFC_TABLE_FULL
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1631"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1672"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91382,40 +91866,40 @@
 
 # Replacing or modifying an existing flow is allowed.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1635: ovs-ofctl add-flow br0 in_port=4,actions=normal"
-at_fn_check_prepare_trace "ofproto.at:1635"
+$as_echo "$at_srcdir/ofproto.at:1676: ovs-ofctl add-flow br0 in_port=4,actions=normal"
+at_fn_check_prepare_trace "ofproto.at:1676"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=4,actions=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1635"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1676"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1636: ovs-ofctl mod-flows br0 in_port=3,actions=output:1"
-at_fn_check_prepare_trace "ofproto.at:1636"
+$as_echo "$at_srcdir/ofproto.at:1677: ovs-ofctl mod-flows br0 in_port=3,actions=output:1"
+at_fn_check_prepare_trace "ofproto.at:1677"
 ( $at_check_trace; ovs-ofctl mod-flows br0 in_port=3,actions=output:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1636"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1677"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1637: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1637"
+$as_echo "$at_srcdir/ofproto.at:1678: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1678"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -91426,52 +91910,52 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1678"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1644: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1644"
+$as_echo "$at_srcdir/ofproto.at:1685: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1685"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1644"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1685"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1644: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1644"
+$as_echo "$at_srcdir/ofproto.at:1685: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1685"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1644"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1685"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1644: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1644"
+$as_echo "$at_srcdir/ofproto.at:1685: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1685"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1644"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1685"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91481,13 +91965,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_742
-#AT_START_743
-at_fn_group_banner 743 'ofproto.at:1647' \
+#AT_STOP_744
+#AT_START_745
+at_fn_group_banner 745 'ofproto.at:1688' \
   "ofproto - hard limits on flow table size (OpenFlow 1.2)" "" 49
 at_xfail=no
 (
-  $as_echo "743. $at_setup_line: testing $at_desc ..."
+  $as_echo "745. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -91497,29 +91981,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1648: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1648"
+$as_echo "$at_srcdir/ofproto.at:1689: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1689"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1648"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1689"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1648: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1648"
+$as_echo "$at_srcdir/ofproto.at:1689: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1689"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1648"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1689"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -91529,49 +92013,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1648: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1689: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1648"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1689"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1648"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1689"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1648: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1648"
+$as_echo "$at_srcdir/ofproto.at:1689: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1689"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1648"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1689"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1648: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1648"
+$as_echo "$at_srcdir/ofproto.at:1689: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1689"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1648"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1689"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -91583,14 +92067,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1648: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1689: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1648"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1689"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -91598,12 +92082,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1648"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1689"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91612,15 +92096,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1648: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1648"
+$as_echo "$at_srcdir/ofproto.at:1689: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1689"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1648"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1689"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91629,23 +92113,23 @@
 
 # Configure a maximum of 4 flows.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1650: ovs-vsctl \\
+$as_echo "$at_srcdir/ofproto.at:1691: ovs-vsctl \\
      -- --id=@t0 create Flow_Table flow-limit=4 \\
      -- set bridge br0 flow_tables:0=@t0 \\
    | \${PERL} \$srcdir/uuidfilt.pl"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1650"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1691"
 ( $at_check_trace; ovs-vsctl \
      -- --id=@t0 create Flow_Table flow-limit=4 \
      -- set bridge br0 flow_tables:0=@t0 \
    | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "<0>
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1650"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1691"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91656,10 +92140,10 @@
     ovs-ofctl -O OpenFlow12 add-flow br0 in_port=$in_port,actions=drop
 done
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1661: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1661"
+$as_echo "$at_srcdir/ofproto.at:1702: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1702"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -91670,7 +92154,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1702"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91678,32 +92162,32 @@
 
 # Adding another flow will be refused.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1669: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=5,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1669"
+$as_echo "$at_srcdir/ofproto.at:1710: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=5,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:1710"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 in_port=5,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:1669"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:1710"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1670: head -n 1 stderr | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1670"
+$as_echo "$at_srcdir/ofproto.at:1711: head -n 1 stderr | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1711"
 ( $at_check_trace; head -n 1 stderr | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPT_ERROR (OF1.2): OFPFMFC_TABLE_FULL
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1670"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1711"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91711,40 +92195,40 @@
 
 # Replacing or modifying an existing flow is allowed.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1674: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=4,actions=normal"
-at_fn_check_prepare_trace "ofproto.at:1674"
+$as_echo "$at_srcdir/ofproto.at:1715: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=4,actions=normal"
+at_fn_check_prepare_trace "ofproto.at:1715"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 in_port=4,actions=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1674"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1715"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1675: ovs-ofctl -O OpenFlow12 mod-flows br0 in_port=3,actions=output:1"
-at_fn_check_prepare_trace "ofproto.at:1675"
+$as_echo "$at_srcdir/ofproto.at:1716: ovs-ofctl -O OpenFlow12 mod-flows br0 in_port=3,actions=output:1"
+at_fn_check_prepare_trace "ofproto.at:1716"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 mod-flows br0 in_port=3,actions=output:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1675"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1716"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1676: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1676"
+$as_echo "$at_srcdir/ofproto.at:1717: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1717"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -91755,52 +92239,52 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1676"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1717"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1683: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1683"
+$as_echo "$at_srcdir/ofproto.at:1724: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1724"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1683"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1724"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1683: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1683"
+$as_echo "$at_srcdir/ofproto.at:1724: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1724"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1683"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1724"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1683: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1683"
+$as_echo "$at_srcdir/ofproto.at:1724: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1724"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1683"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1724"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91810,13 +92294,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_743
-#AT_START_744
-at_fn_group_banner 744 'ofproto.at:1686' \
+#AT_STOP_745
+#AT_START_746
+at_fn_group_banner 746 'ofproto.at:1727' \
   "ofproto - eviction upon table overflow (OpenFlow 1.0)" "" 49
 at_xfail=no
 (
-  $as_echo "744. $at_setup_line: testing $at_desc ..."
+  $as_echo "746. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -91826,29 +92310,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1687: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1687"
+$as_echo "$at_srcdir/ofproto.at:1728: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1728"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1687"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1728"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1687: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1687"
+$as_echo "$at_srcdir/ofproto.at:1728: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1728"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1687"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1728"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -91858,49 +92342,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1687: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1728: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1687"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1728"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1687"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1728"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1687: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1687"
+$as_echo "$at_srcdir/ofproto.at:1728: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1728"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1687"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1728"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1687: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1687"
+$as_echo "$at_srcdir/ofproto.at:1728: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1728"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1687"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1728"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -91912,14 +92396,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1687: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1728: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1687"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1728"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -91927,12 +92411,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1687"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1728"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91941,15 +92425,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1687: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1687"
+$as_echo "$at_srcdir/ofproto.at:1728: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1728"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1687"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1728"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91958,23 +92442,23 @@
 
 # Configure a maximum of 4 flows.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1689: ovs-vsctl \\
+$as_echo "$at_srcdir/ofproto.at:1730: ovs-vsctl \\
      -- --id=@t0 create Flow_Table flow-limit=4 overflow-policy=evict \\
      -- set bridge br0 flow_tables:0=@t0 \\
    | \${PERL} \$srcdir/uuidfilt.pl"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1689"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1730"
 ( $at_check_trace; ovs-vsctl \
      -- --id=@t0 create Flow_Table flow-limit=4 overflow-policy=evict \
      -- set bridge br0 flow_tables:0=@t0 \
    | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "<0>
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1689"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1730"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91985,10 +92469,10 @@
     ovs-ofctl add-flow br0 idle_timeout=${in_port}0,in_port=$in_port,actions=drop
 done
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1700: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1700"
+$as_echo "$at_srcdir/ofproto.at:1741: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1741"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -91999,7 +92483,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1700"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1741"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92007,25 +92491,25 @@
 
 # Adding another flow will cause the one that expires soonest to be evicted.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1708: ovs-ofctl add-flow br0 in_port=5,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1708"
+$as_echo "$at_srcdir/ofproto.at:1749: ovs-ofctl add-flow br0 in_port=5,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:1749"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=5,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1708"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1749"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1709: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1709"
+$as_echo "$at_srcdir/ofproto.at:1750: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1750"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -92036,7 +92520,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1709"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1750"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92045,55 +92529,55 @@
 # A mod-flow that adds a flow also causes eviction, but replacing or
 # modifying an existing flow doesn't.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1718: ovs-ofctl mod-flows br0 in_port=6,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1718"
+$as_echo "$at_srcdir/ofproto.at:1759: ovs-ofctl mod-flows br0 in_port=6,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:1759"
 ( $at_check_trace; ovs-ofctl mod-flows br0 in_port=6,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1718"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1759"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1719: ovs-ofctl add-flow br0 in_port=4,actions=normal"
-at_fn_check_prepare_trace "ofproto.at:1719"
+$as_echo "$at_srcdir/ofproto.at:1760: ovs-ofctl add-flow br0 in_port=4,actions=normal"
+at_fn_check_prepare_trace "ofproto.at:1760"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=4,actions=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1719"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1760"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1720: ovs-ofctl mod-flows br0 in_port=3,actions=output:1"
-at_fn_check_prepare_trace "ofproto.at:1720"
+$as_echo "$at_srcdir/ofproto.at:1761: ovs-ofctl mod-flows br0 in_port=3,actions=output:1"
+at_fn_check_prepare_trace "ofproto.at:1761"
 ( $at_check_trace; ovs-ofctl mod-flows br0 in_port=3,actions=output:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1720"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1761"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1721: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1721"
+$as_echo "$at_srcdir/ofproto.at:1762: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1762"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -92104,7 +92588,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1721"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1762"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92112,57 +92596,57 @@
 
 # Flows with no timeouts at all cannot be evicted.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1729: ovs-ofctl add-flow br0 in_port=7,actions=normal"
-at_fn_check_prepare_trace "ofproto.at:1729"
+$as_echo "$at_srcdir/ofproto.at:1770: ovs-ofctl add-flow br0 in_port=7,actions=normal"
+at_fn_check_prepare_trace "ofproto.at:1770"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=7,actions=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1729"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1770"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1730: ovs-ofctl add-flow br0 in_port=8,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1730"
+$as_echo "$at_srcdir/ofproto.at:1771: ovs-ofctl add-flow br0 in_port=8,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:1771"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=8,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:1730"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:1771"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1731: head -n 1 stderr | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1731"
+$as_echo "$at_srcdir/ofproto.at:1772: head -n 1 stderr | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1772"
 ( $at_check_trace; head -n 1 stderr | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPT_ERROR: OFPFMFC_TABLE_FULL
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1731"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1772"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1734: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1734"
+$as_echo "$at_srcdir/ofproto.at:1775: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1775"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -92173,52 +92657,52 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1734"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1775"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1741: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1741"
+$as_echo "$at_srcdir/ofproto.at:1782: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1782"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1741"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1782"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1741: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1741"
+$as_echo "$at_srcdir/ofproto.at:1782: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1782"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1741"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1782"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1741: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1741"
+$as_echo "$at_srcdir/ofproto.at:1782: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1782"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1741"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1782"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92228,13 +92712,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_744
-#AT_START_745
-at_fn_group_banner 745 'ofproto.at:1744' \
+#AT_STOP_746
+#AT_START_747
+at_fn_group_banner 747 'ofproto.at:1785' \
   "ofproto - eviction upon table overflow (OpenFlow 1.2)" "" 49
 at_xfail=no
 (
-  $as_echo "745. $at_setup_line: testing $at_desc ..."
+  $as_echo "747. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -92244,29 +92728,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1745: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1745"
+$as_echo "$at_srcdir/ofproto.at:1786: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1786"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1745"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1786"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1745: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1745"
+$as_echo "$at_srcdir/ofproto.at:1786: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1786"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1745"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1786"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -92276,49 +92760,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1745: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1786: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1745"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1786"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1745"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1786"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1745: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1745"
+$as_echo "$at_srcdir/ofproto.at:1786: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1786"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1745"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1786"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1745: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1745"
+$as_echo "$at_srcdir/ofproto.at:1786: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1786"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1745"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1786"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -92330,14 +92814,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1745: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1786: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1745"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1786"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -92345,12 +92829,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1745"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1786"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92359,15 +92843,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1745: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1745"
+$as_echo "$at_srcdir/ofproto.at:1786: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1786"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1745"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1786"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92376,23 +92860,23 @@
 
 # Configure a maximum of 4 flows.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1747: ovs-vsctl \\
+$as_echo "$at_srcdir/ofproto.at:1788: ovs-vsctl \\
      -- --id=@t0 create Flow_Table flow-limit=4 overflow-policy=evict \\
      -- set bridge br0 flow_tables:0=@t0 \\
    | \${PERL} \$srcdir/uuidfilt.pl"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1747"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1788"
 ( $at_check_trace; ovs-vsctl \
      -- --id=@t0 create Flow_Table flow-limit=4 overflow-policy=evict \
      -- set bridge br0 flow_tables:0=@t0 \
    | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "<0>
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1747"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1788"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92403,10 +92887,10 @@
     ovs-ofctl -O OpenFlow12 add-flow br0 idle_timeout=${in_port}0,in_port=$in_port,actions=drop
 done
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1758: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1758"
+$as_echo "$at_srcdir/ofproto.at:1799: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1799"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -92417,7 +92901,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1758"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1799"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92425,25 +92909,25 @@
 
 # Adding another flow will cause the one that expires soonest to be evicted.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1766: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=5,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1766"
+$as_echo "$at_srcdir/ofproto.at:1807: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=5,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:1807"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 in_port=5,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1766"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1807"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1767: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1767"
+$as_echo "$at_srcdir/ofproto.at:1808: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1808"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -92454,7 +92938,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1767"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1808"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92463,55 +92947,55 @@
 # In OpenFlow 1.2 a mod-flow does not ever add a flow and thus
 # has no effect on eviction
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1776: ovs-ofctl -O OpenFlow12 mod-flows br0 in_port=6,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1776"
+$as_echo "$at_srcdir/ofproto.at:1817: ovs-ofctl -O OpenFlow12 mod-flows br0 in_port=6,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:1817"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 mod-flows br0 in_port=6,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1776"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1817"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1777: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=4,actions=normal"
-at_fn_check_prepare_trace "ofproto.at:1777"
+$as_echo "$at_srcdir/ofproto.at:1818: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=4,actions=normal"
+at_fn_check_prepare_trace "ofproto.at:1818"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 in_port=4,actions=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1777"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1818"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1778: ovs-ofctl -O OpenFlow12 mod-flows br0 in_port=3,actions=output:1"
-at_fn_check_prepare_trace "ofproto.at:1778"
+$as_echo "$at_srcdir/ofproto.at:1819: ovs-ofctl -O OpenFlow12 mod-flows br0 in_port=3,actions=output:1"
+at_fn_check_prepare_trace "ofproto.at:1819"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 mod-flows br0 in_port=3,actions=output:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1778"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1819"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1779: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1779"
+$as_echo "$at_srcdir/ofproto.at:1820: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1820"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -92522,7 +93006,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1779"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1820"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92530,72 +93014,72 @@
 
 # Flows with no timeouts at all cannot be evicted.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1787: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=6,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1787"
+$as_echo "$at_srcdir/ofproto.at:1828: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=6,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:1828"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 in_port=6,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1787"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1828"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1788: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=7,actions=normal"
-at_fn_check_prepare_trace "ofproto.at:1788"
+$as_echo "$at_srcdir/ofproto.at:1829: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=7,actions=normal"
+at_fn_check_prepare_trace "ofproto.at:1829"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 in_port=7,actions=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1788"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1829"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1789: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=8,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1789"
+$as_echo "$at_srcdir/ofproto.at:1830: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=8,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:1830"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 in_port=8,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:1789"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto.at:1830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1790: head -n 1 stderr | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1790"
+$as_echo "$at_srcdir/ofproto.at:1831: head -n 1 stderr | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1831"
 ( $at_check_trace; head -n 1 stderr | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPT_ERROR (OF1.2): OFPFMFC_TABLE_FULL
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1790"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1831"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1793: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1793"
+$as_echo "$at_srcdir/ofproto.at:1834: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1834"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -92606,52 +93090,52 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1793"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1834"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1800: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1800"
+$as_echo "$at_srcdir/ofproto.at:1841: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1841"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1800"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1841"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1800: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1800"
+$as_echo "$at_srcdir/ofproto.at:1841: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1841"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1800"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1841"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1800: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1800"
+$as_echo "$at_srcdir/ofproto.at:1841: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1841"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1800"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1841"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92661,13 +93145,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_745
-#AT_START_746
-at_fn_group_banner 746 'ofproto.at:1803' \
+#AT_STOP_747
+#AT_START_748
+at_fn_group_banner 748 'ofproto.at:1844' \
   "ofproto - eviction upon table overflow, with fairness (OpenFlow 1.0)" "" 49
 at_xfail=no
 (
-  $as_echo "746. $at_setup_line: testing $at_desc ..."
+  $as_echo "748. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -92677,29 +93161,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1804: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1804"
+$as_echo "$at_srcdir/ofproto.at:1845: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1845"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1845"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1804: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1804"
+$as_echo "$at_srcdir/ofproto.at:1845: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1845"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1845"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -92709,49 +93193,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1804: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1845: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1804"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1845"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1845"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1804: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1804"
+$as_echo "$at_srcdir/ofproto.at:1845: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1845"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1804: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1804"
+$as_echo "$at_srcdir/ofproto.at:1845: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1845"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -92763,14 +93247,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1804: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1845: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1804"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1845"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -92778,12 +93262,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92792,15 +93276,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1804: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1804"
+$as_echo "$at_srcdir/ofproto.at:1845: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1845"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92809,27 +93293,27 @@
 
 # Configure a maximum of 4 flows.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1806: ovs-vsctl \\
+$as_echo "$at_srcdir/ofproto.at:1847: ovs-vsctl \\
      -- --id=@t0 create Flow_Table name=evict flow-limit=4 \\
                                    overflow-policy=evict \\
                                    groups='\"NXM_OF_IN_PORT[]\"' \\
      -- set bridge br0 flow_tables:0=@t0 \\
    | \${PERL} \$srcdir/uuidfilt.pl"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1806"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1847"
 ( $at_check_trace; ovs-vsctl \
      -- --id=@t0 create Flow_Table name=evict flow-limit=4 \
                                    overflow-policy=evict \
                                    groups='"NXM_OF_IN_PORT[]"' \
      -- set bridge br0 flow_tables:0=@t0 \
    | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "<0>
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1806"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1847"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92843,10 +93327,10 @@
 idle_timeout=40 in_port=1 dl_src=00:33:44:55:66:77 actions=drop
 EOF
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1822: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1822"
+$as_echo "$at_srcdir/ofproto.at:1863: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1863"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -92857,7 +93341,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1822"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1863"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92868,25 +93352,25 @@
 # case this is not the same as the one that expires soonest overall
 # (which is what makes the test interesting):
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1833: ovs-ofctl add-flow br0 in_port=2,dl_src=00:55:66:77:88:99,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1833"
+$as_echo "$at_srcdir/ofproto.at:1874: ovs-ofctl add-flow br0 in_port=2,dl_src=00:55:66:77:88:99,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:1874"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=2,dl_src=00:55:66:77:88:99,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1833"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1874"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1834: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1834"
+$as_echo "$at_srcdir/ofproto.at:1875: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1875"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -92897,7 +93381,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1834"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1875"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92906,15 +93390,15 @@
 # Enlarge the flow limit, change the eviction policy back to strictly
 # based on expiration, and and add some flows.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1843: ovs-vsctl set Flow_Table evict groups='[]' flow-limit=7"
-at_fn_check_prepare_trace "ofproto.at:1843"
+$as_echo "$at_srcdir/ofproto.at:1884: ovs-vsctl set Flow_Table evict groups='[]' flow-limit=7"
+at_fn_check_prepare_trace "ofproto.at:1884"
 ( $at_check_trace; ovs-vsctl set Flow_Table evict groups='[]' flow-limit=7
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1843"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92926,10 +93410,10 @@
 idle_timeout=70 in_port=2 dl_src=00:88:99:aa:bb:cc actions=drop
 EOF
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1849: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1849"
+$as_echo "$at_srcdir/ofproto.at:1890: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1890"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -92943,7 +93427,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1849"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92952,25 +93436,25 @@
 # Adding another flow will cause the one that expires soonest overall
 # to be evicted.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1861: ovs-ofctl add-flow br0 'idle_timeout=80 in_port=2 dl_src=00:99:aa:bb:cc:dd actions=drop'"
-at_fn_check_prepare_trace "ofproto.at:1861"
+$as_echo "$at_srcdir/ofproto.at:1902: ovs-ofctl add-flow br0 'idle_timeout=80 in_port=2 dl_src=00:99:aa:bb:cc:dd actions=drop'"
+at_fn_check_prepare_trace "ofproto.at:1902"
 ( $at_check_trace; ovs-ofctl add-flow br0 'idle_timeout=80 in_port=2 dl_src=00:99:aa:bb:cc:dd actions=drop'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1861"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1902"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1862: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1862"
+$as_echo "$at_srcdir/ofproto.at:1903: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1903"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -92984,7 +93468,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1862"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1903"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92993,25 +93477,25 @@
 # Reducing the flow limit also causes the flows that expire soonest
 # overall to be evicted.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1874: ovs-vsctl set Flow_Table evict flow-limit=4"
-at_fn_check_prepare_trace "ofproto.at:1874"
+$as_echo "$at_srcdir/ofproto.at:1915: ovs-vsctl set Flow_Table evict flow-limit=4"
+at_fn_check_prepare_trace "ofproto.at:1915"
 ( $at_check_trace; ovs-vsctl set Flow_Table evict flow-limit=4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1874"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1915"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1875: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1875"
+$as_echo "$at_srcdir/ofproto.at:1916: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1916"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -93022,52 +93506,52 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1875"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1916"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1882: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1882"
+$as_echo "$at_srcdir/ofproto.at:1923: check_logs "
+at_fn_check_prepare_trace "ofproto.at:1923"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1882"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1923"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1882: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1882"
+$as_echo "$at_srcdir/ofproto.at:1923: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:1923"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1882"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1923"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1882: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1882"
+$as_echo "$at_srcdir/ofproto.at:1923: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:1923"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1882"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1923"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93077,13 +93561,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_746
-#AT_START_747
-at_fn_group_banner 747 'ofproto.at:1885' \
+#AT_STOP_748
+#AT_START_749
+at_fn_group_banner 749 'ofproto.at:1926' \
   "ofproto - eviction upon table overflow, with fairness (OpenFlow 1.2)" "" 49
 at_xfail=no
 (
-  $as_echo "747. $at_setup_line: testing $at_desc ..."
+  $as_echo "749. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -93093,29 +93577,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1886: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1886"
+$as_echo "$at_srcdir/ofproto.at:1927: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1927"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1886"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1927"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1886: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1886"
+$as_echo "$at_srcdir/ofproto.at:1927: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1927"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1886"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1927"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -93125,49 +93609,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1886: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1927: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1886"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1927"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1886"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1927"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1886: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1886"
+$as_echo "$at_srcdir/ofproto.at:1927: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:1927"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1886"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1927"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1886: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1886"
+$as_echo "$at_srcdir/ofproto.at:1927: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:1927"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1886"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1927"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -93179,14 +93663,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1886: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:1927: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1886"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1927"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -93194,12 +93678,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1886"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1927"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93208,15 +93692,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1886: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1886"
+$as_echo "$at_srcdir/ofproto.at:1927: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:1927"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1886"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1927"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93225,27 +93709,27 @@
 
 # Configure a maximum of 4 flows.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1888: ovs-vsctl \\
+$as_echo "$at_srcdir/ofproto.at:1929: ovs-vsctl \\
      -- --id=@t0 create Flow_Table name=evict flow-limit=4 \\
                                    overflow-policy=evict \\
                                    groups='\"NXM_OF_IN_PORT[]\"' \\
      -- set bridge br0 flow_tables:0=@t0 \\
    | \${PERL} \$srcdir/uuidfilt.pl"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1888"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1929"
 ( $at_check_trace; ovs-vsctl \
      -- --id=@t0 create Flow_Table name=evict flow-limit=4 \
                                    overflow-policy=evict \
                                    groups='"NXM_OF_IN_PORT[]"' \
      -- set bridge br0 flow_tables:0=@t0 \
    | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "<0>
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1888"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1929"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93259,10 +93743,10 @@
 idle_timeout=40 in_port=1 dl_src=00:33:44:55:66:77 actions=drop
 EOF
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1904: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1904"
+$as_echo "$at_srcdir/ofproto.at:1945: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1945"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -93273,7 +93757,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1904"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93284,25 +93768,25 @@
 # case this is not the same as the one that expires soonest overall
 # (which is what makes the test interesting):
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1915: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=2,dl_src=00:55:66:77:88:99,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1915"
+$as_echo "$at_srcdir/ofproto.at:1956: ovs-ofctl -O OpenFlow12 add-flow br0 in_port=2,dl_src=00:55:66:77:88:99,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:1956"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 in_port=2,dl_src=00:55:66:77:88:99,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1915"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1956"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1916: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1916"
+$as_echo "$at_srcdir/ofproto.at:1957: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1957"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -93313,7 +93797,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1916"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93322,15 +93806,15 @@
 # Enlarge the flow limit, change the eviction policy back to strictly
 # based on expiration, and and add some flows.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1925: ovs-vsctl set Flow_Table evict groups='[]' flow-limit=7"
-at_fn_check_prepare_trace "ofproto.at:1925"
+$as_echo "$at_srcdir/ofproto.at:1966: ovs-vsctl set Flow_Table evict groups='[]' flow-limit=7"
+at_fn_check_prepare_trace "ofproto.at:1966"
 ( $at_check_trace; ovs-vsctl set Flow_Table evict groups='[]' flow-limit=7
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1925"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1966"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93342,10 +93826,10 @@
 idle_timeout=70 in_port=2 dl_src=00:88:99:aa:bb:cc actions=drop
 EOF
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1931: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1931"
+$as_echo "$at_srcdir/ofproto.at:1972: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1972"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -93359,7 +93843,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1931"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1972"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93368,25 +93852,25 @@
 # Adding another flow will cause the one that expires soonest overall
 # to be evicted.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1943: ovs-ofctl -O OpenFlow12 add-flow br0 'idle_timeout=80 in_port=2 dl_src=00:99:aa:bb:cc:dd actions=drop'"
-at_fn_check_prepare_trace "ofproto.at:1943"
+$as_echo "$at_srcdir/ofproto.at:1984: ovs-ofctl -O OpenFlow12 add-flow br0 'idle_timeout=80 in_port=2 dl_src=00:99:aa:bb:cc:dd actions=drop'"
+at_fn_check_prepare_trace "ofproto.at:1984"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'idle_timeout=80 in_port=2 dl_src=00:99:aa:bb:cc:dd actions=drop'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1943"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1944: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1944"
+$as_echo "$at_srcdir/ofproto.at:1985: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1985"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -93400,7 +93884,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1944"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93409,25 +93893,25 @@
 # Reducing the flow limit also causes the flows that expire soonest
 # overall to be evicted.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1956: ovs-vsctl set Flow_Table evict flow-limit=4"
-at_fn_check_prepare_trace "ofproto.at:1956"
+$as_echo "$at_srcdir/ofproto.at:1997: ovs-vsctl set Flow_Table evict flow-limit=4"
+at_fn_check_prepare_trace "ofproto.at:1997"
 ( $at_check_trace; ovs-vsctl set Flow_Table evict flow-limit=4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1956"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1997"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1957: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1957"
+$as_echo "$at_srcdir/ofproto.at:1998: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1998"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -93438,52 +93922,52 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1957"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1998"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1964: check_logs "
-at_fn_check_prepare_trace "ofproto.at:1964"
+$as_echo "$at_srcdir/ofproto.at:2005: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2005"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1964"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2005"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1964: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:1964"
+$as_echo "$at_srcdir/ofproto.at:2005: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2005"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1964"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2005"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1964: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:1964"
+$as_echo "$at_srcdir/ofproto.at:2005: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2005"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1964"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2005"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93493,13 +93977,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_747
-#AT_START_748
-at_fn_group_banner 748 'ofproto.at:1967' \
+#AT_STOP_749
+#AT_START_750
+at_fn_group_banner 750 'ofproto.at:2008' \
   "ofproto - eviction upon table overflow, with modified hard timeout" "" 49
 at_xfail=no
 (
-  $as_echo "748. $at_setup_line: testing $at_desc ..."
+  $as_echo "750. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -93509,29 +93993,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1968: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:1968"
+$as_echo "$at_srcdir/ofproto.at:2009: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2009"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1968"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2009"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1968: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:1968"
+$as_echo "$at_srcdir/ofproto.at:2009: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2009"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1968"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2009"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -93541,49 +94025,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1968: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2009: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1968"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2009"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1968"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2009"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1968: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:1968"
+$as_echo "$at_srcdir/ofproto.at:2009: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2009"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1968"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2009"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1968: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:1968"
+$as_echo "$at_srcdir/ofproto.at:2009: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2009"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1968"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2009"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -93595,14 +94079,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:1968: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2009: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:1968"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2009"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -93610,12 +94094,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1968"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2009"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93624,15 +94108,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:1968: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:1968"
+$as_echo "$at_srcdir/ofproto.at:2009: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2009"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1968"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2009"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93641,23 +94125,23 @@
 
 # Configure a maximum of 4 flows.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1970: ovs-vsctl \\
+$as_echo "$at_srcdir/ofproto.at:2011: ovs-vsctl \\
      -- --id=@t0 create Flow_Table flow-limit=4 overflow-policy=evict \\
      -- set bridge br0 flow_tables:0=@t0 \\
    | \${PERL} \$srcdir/uuidfilt.pl"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:1970"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:2011"
 ( $at_check_trace; ovs-vsctl \
      -- --id=@t0 create Flow_Table flow-limit=4 overflow-policy=evict \
      -- set bridge br0 flow_tables:0=@t0 \
    | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "<0>
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1970"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2011"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93669,10 +94153,10 @@
     ovs-ofctl add-flow br0 hard_timeout=$((10 + in_port * 3)),in_port=$in_port,actions=drop
 done
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1982: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:1982"
+$as_echo "$at_srcdir/ofproto.at:2023: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2023"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -93683,7 +94167,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1982"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2023"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93692,15 +94176,15 @@
 # Sleep and modify the one that expires soonest
 ovs-appctl time/warp 5000
 { set +x
-$as_echo "$at_srcdir/ofproto.at:1991: ovs-ofctl mod-flows br0 in_port=1,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:1991"
+$as_echo "$at_srcdir/ofproto.at:2032: ovs-ofctl mod-flows br0 in_port=1,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:2032"
 ( $at_check_trace; ovs-ofctl mod-flows br0 in_port=1,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:1991"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2032"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93715,25 +94199,25 @@
 ovs-appctl time/warp 2000
 # Adding another flow will cause the one that expires soonest to be evicted.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2000: ovs-ofctl add-flow br0 in_port=5,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:2000"
+$as_echo "$at_srcdir/ofproto.at:2041: ovs-ofctl add-flow br0 in_port=5,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:2041"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=5,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2000"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2001: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2001"
+$as_echo "$at_srcdir/ofproto.at:2042: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2042"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -93744,52 +94228,52 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2001"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2008: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2008"
+$as_echo "$at_srcdir/ofproto.at:2049: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2049"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2008"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2049"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2008: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2008"
+$as_echo "$at_srcdir/ofproto.at:2049: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2049"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2008"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2049"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2008: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2008"
+$as_echo "$at_srcdir/ofproto.at:2049: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2049"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2008"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2049"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93799,13 +94283,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_748
-#AT_START_749
-at_fn_group_banner 749 'ofproto.at:2011' \
+#AT_STOP_750
+#AT_START_751
+at_fn_group_banner 751 'ofproto.at:2052' \
   "ofproto - eviction upon table overflow, with modified idle timeout" "" 49
 at_xfail=no
 (
-  $as_echo "749. $at_setup_line: testing $at_desc ..."
+  $as_echo "751. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -93815,29 +94299,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2012: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2012"
+$as_echo "$at_srcdir/ofproto.at:2053: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2053"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2012"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2053"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2012: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2012"
+$as_echo "$at_srcdir/ofproto.at:2053: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2053"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2012"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2053"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -93847,49 +94331,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2012: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2053: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2012"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2053"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2012"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2053"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2012: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2012"
+$as_echo "$at_srcdir/ofproto.at:2053: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2053"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2012"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2053"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2012: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2012"
+$as_echo "$at_srcdir/ofproto.at:2053: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2053"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2012"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2053"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -93901,14 +94385,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2012: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2053: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2012"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2053"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -93916,12 +94400,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2012"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2053"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93930,15 +94414,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2012: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set interface p1 type=dummy ofport_request=1 "
-at_fn_check_prepare_trace "ofproto.at:2012"
+$as_echo "$at_srcdir/ofproto.at:2053: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set interface p1 type=dummy ofport_request=1 "
+at_fn_check_prepare_trace "ofproto.at:2053"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set interface p1 type=dummy ofport_request=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2012"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2053"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93947,23 +94431,23 @@
 
 # Configure a maximum of 4 flows.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2014: ovs-vsctl \\
+$as_echo "$at_srcdir/ofproto.at:2055: ovs-vsctl \\
      -- --id=@t0 create Flow_Table flow-limit=4 overflow-policy=evict \\
      -- set bridge br0 flow_tables:0=@t0 \\
    | \${PERL} \$srcdir/uuidfilt.pl"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:2014"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ofproto.at:2055"
 ( $at_check_trace; ovs-vsctl \
      -- --id=@t0 create Flow_Table flow-limit=4 overflow-policy=evict \
      -- set bridge br0 flow_tables:0=@t0 \
    | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "<0>
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2014"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2055"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93975,10 +94459,10 @@
 done
 ovs-appctl time/stop
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2026: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2026"
+$as_echo "$at_srcdir/ofproto.at:2067: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2067"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -93989,7 +94473,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2067"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93998,15 +94482,15 @@
 # Sleep and receive on the flow that expires soonest
 ovs-appctl time/warp 5000
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2035: ovs-appctl netdev-dummy/receive p1 'in_port(1)'"
-at_fn_check_prepare_trace "ofproto.at:2035"
+$as_echo "$at_srcdir/ofproto.at:2076: ovs-appctl netdev-dummy/receive p1 'in_port(1)'"
+at_fn_check_prepare_trace "ofproto.at:2076"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2035"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2076"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94021,25 +94505,25 @@
 ovs-appctl time/warp 2000
 # Adding another flow will cause the one that expires soonest to be evicted.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2044: ovs-ofctl add-flow br0 in_port=5,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:2044"
+$as_echo "$at_srcdir/ofproto.at:2085: ovs-ofctl add-flow br0 in_port=5,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:2085"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=5,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2044"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2085"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2045: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2045"
+$as_echo "$at_srcdir/ofproto.at:2086: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2086"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -94050,52 +94534,52 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2045"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2086"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2052: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2052"
+$as_echo "$at_srcdir/ofproto.at:2093: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2093"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2052"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2093"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2052: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2052"
+$as_echo "$at_srcdir/ofproto.at:2093: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2093"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2052"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2093"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2052: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2052"
+$as_echo "$at_srcdir/ofproto.at:2093: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2093"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2052"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2093"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94105,13 +94589,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_749
-#AT_START_750
-at_fn_group_banner 750 'ofproto.at:2055' \
+#AT_STOP_751
+#AT_START_752
+at_fn_group_banner 752 'ofproto.at:2096' \
   "ofproto - asynchronous message control (OpenFlow 1.0)" "" 49
 at_xfail=no
 (
-  $as_echo "750. $at_setup_line: testing $at_desc ..."
+  $as_echo "752. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -94121,29 +94605,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2056: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2056"
+$as_echo "$at_srcdir/ofproto.at:2097: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2097"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2056"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2097"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2056: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2056"
+$as_echo "$at_srcdir/ofproto.at:2097: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2097"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2056"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2097"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -94153,49 +94637,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2056: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2097: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2056"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2097"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2056"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2097"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2056: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2056"
+$as_echo "$at_srcdir/ofproto.at:2097: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2097"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2056"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2056: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2056"
+$as_echo "$at_srcdir/ofproto.at:2097: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2097"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2056"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -94207,14 +94691,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2056: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2097: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2056"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2097"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -94222,12 +94706,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2056"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94236,15 +94720,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2056: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2056"
+$as_echo "$at_srcdir/ofproto.at:2097: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2097"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2056"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94252,15 +94736,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2057: ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile"
-at_fn_check_prepare_trace "ofproto.at:2057"
+$as_echo "$at_srcdir/ofproto.at:2098: ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile"
+at_fn_check_prepare_trace "ofproto.at:2098"
 ( $at_check_trace; ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2057"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94319,29 +94803,29 @@
     if test X"$1" = X"OFPRR_DELETE"; then shift;
         echo >>expout "OFPT_FLOW_REMOVED:  reason=delete"
     fi
-    $as_echo "ofproto.at:2111" >"$at_check_line_file"
+    $as_echo "ofproto.at:2152" >"$at_check_line_file"
 (test X"$1" != X) \
-  && at_fn_check_skip 99 "$at_srcdir/ofproto.at:2111"
+  && at_fn_check_skip 99 "$at_srcdir/ofproto.at:2152"
 
     ovs-appctl -t ovs-ofctl ofctl/barrier
     echo >>expout "OFPT_BARRIER_REPLY:"
 
     { set +x
-$as_echo "$at_srcdir/ofproto.at:2116: sed '
+$as_echo "$at_srcdir/ofproto.at:2157: sed '
 s/ (xid=0x[0-9a-fA-F]*)//
 s/ *duration.*//
 s/00:0.\$/00:0x/' < monitor.log"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2116"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2157"
 ( $at_check_trace; sed '
 s/ (xid=0x[0-9a-fA-F]*)//
 s/ *duration.*//
 s/00:0.$/00:0x/' < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2116"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2157"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94381,45 +94865,45 @@
 
 ovs-appctl -t ovs-ofctl exit
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2155: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2155"
+$as_echo "$at_srcdir/ofproto.at:2196: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2196"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2155"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2196"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2155: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2155"
+$as_echo "$at_srcdir/ofproto.at:2196: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2196"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2155"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2196"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2155: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2155"
+$as_echo "$at_srcdir/ofproto.at:2196: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2196"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2155"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2196"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94429,13 +94913,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_750
-#AT_START_751
-at_fn_group_banner 751 'ofproto.at:2158' \
+#AT_STOP_752
+#AT_START_753
+at_fn_group_banner 753 'ofproto.at:2199' \
   "ofproto - asynchronous message control (OpenFlow 1.2)" "" 49
 at_xfail=no
 (
-  $as_echo "751. $at_setup_line: testing $at_desc ..."
+  $as_echo "753. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -94445,29 +94929,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2159: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2159"
+$as_echo "$at_srcdir/ofproto.at:2200: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2200"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2159"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2200"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2159: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2159"
+$as_echo "$at_srcdir/ofproto.at:2200: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2200"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2159"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2200"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -94477,49 +94961,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2159: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2200: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2159"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2200"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2159"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2200"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2159: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2159"
+$as_echo "$at_srcdir/ofproto.at:2200: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2200"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2159"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2159: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2159"
+$as_echo "$at_srcdir/ofproto.at:2200: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2200"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2159"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -94531,14 +95015,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2159: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2200: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2159"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2200"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -94546,12 +95030,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2159"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94560,15 +95044,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2159: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2159"
+$as_echo "$at_srcdir/ofproto.at:2200: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2200"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2159"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94576,15 +95060,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2160: ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile"
-at_fn_check_prepare_trace "ofproto.at:2160"
+$as_echo "$at_srcdir/ofproto.at:2201: ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile"
+at_fn_check_prepare_trace "ofproto.at:2201"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2160"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94644,29 +95128,29 @@
     if test X"$1" = X"OFPRR_DELETE"; then shift;
         echo >>expout "OFPT_FLOW_REMOVED (OF1.2):  reason=delete table_id=0"
     fi
-    $as_echo "ofproto.at:2215" >"$at_check_line_file"
+    $as_echo "ofproto.at:2256" >"$at_check_line_file"
 (test X"$1" != X) \
-  && at_fn_check_skip 99 "$at_srcdir/ofproto.at:2215"
+  && at_fn_check_skip 99 "$at_srcdir/ofproto.at:2256"
 
     ovs-appctl -t ovs-ofctl ofctl/barrier
     echo >>expout "OFPT_BARRIER_REPLY (OF1.2):"
 
     { set +x
-$as_echo "$at_srcdir/ofproto.at:2220: sed '
+$as_echo "$at_srcdir/ofproto.at:2261: sed '
 s/ (xid=0x[0-9a-fA-F]*)//
 s/ *duration.*//
 s/00:0.\$/00:0x/' < monitor.log"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2220"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2261"
 ( $at_check_trace; sed '
 s/ (xid=0x[0-9a-fA-F]*)//
 s/ *duration.*//
 s/00:0.$/00:0x/' < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2261"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94706,45 +95190,45 @@
 
 ovs-appctl -t ovs-ofctl exit
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2259: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2259"
+$as_echo "$at_srcdir/ofproto.at:2300: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2300"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2259"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2300"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2259: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2259"
+$as_echo "$at_srcdir/ofproto.at:2300: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2300"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2259"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2300"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2259: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2259"
+$as_echo "$at_srcdir/ofproto.at:2300: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2300"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2259"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2300"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94754,13 +95238,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_751
-#AT_START_752
-at_fn_group_banner 752 'ofproto.at:2262' \
+#AT_STOP_753
+#AT_START_754
+at_fn_group_banner 754 'ofproto.at:2303' \
   "ofproto - asynchronous message control (OpenFlow 1.3)" "" 49
 at_xfail=no
 (
-  $as_echo "752. $at_setup_line: testing $at_desc ..."
+  $as_echo "754. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -94770,29 +95254,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2263: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2263"
+$as_echo "$at_srcdir/ofproto.at:2304: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2304"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2304"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2263: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2263"
+$as_echo "$at_srcdir/ofproto.at:2304: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2304"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2304"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -94802,49 +95286,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2263: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2304: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2263"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2304"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2304"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2263: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2263"
+$as_echo "$at_srcdir/ofproto.at:2304: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2304"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2304"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2263: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2263"
+$as_echo "$at_srcdir/ofproto.at:2304: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2304"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2304"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -94856,14 +95340,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2263: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2304: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2263"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2304"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -94871,12 +95355,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2304"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94885,15 +95369,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2263: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2263"
+$as_echo "$at_srcdir/ofproto.at:2304: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2304"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2304"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94901,15 +95385,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2264: ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile"
-at_fn_check_prepare_trace "ofproto.at:2264"
+$as_echo "$at_srcdir/ofproto.at:2305: ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile"
+at_fn_check_prepare_trace "ofproto.at:2305"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2264"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2305"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94978,29 +95462,29 @@
         echo >>expout "OFPT_FLOW_REMOVED (OF1.3):  reason=gropu_delete table_id=0"
     fi
 
-    $as_echo "ofproto.at:2328" >"$at_check_line_file"
+    $as_echo "ofproto.at:2369" >"$at_check_line_file"
 (test X"$1" != X) \
-  && at_fn_check_skip 99 "$at_srcdir/ofproto.at:2328"
+  && at_fn_check_skip 99 "$at_srcdir/ofproto.at:2369"
 
     ovs-appctl -t ovs-ofctl ofctl/barrier
     echo >>expout "OFPT_BARRIER_REPLY (OF1.3):"
 
     { set +x
-$as_echo "$at_srcdir/ofproto.at:2333: sed '
+$as_echo "$at_srcdir/ofproto.at:2374: sed '
 s/ (xid=0x[0-9a-fA-F]*)//
 s/ *duration.*//
 s/00:0.\$/00:0x/' < monitor.log"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2333"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2374"
 ( $at_check_trace; sed '
 s/ (xid=0x[0-9a-fA-F]*)//
 s/ *duration.*//
 s/00:0.$/00:0x/' < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2333"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2374"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95036,45 +95520,45 @@
 
 ovs-appctl -t ovs-ofctl exit
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2368: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2368"
+$as_echo "$at_srcdir/ofproto.at:2409: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2409"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2368"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2409"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2368: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2368"
+$as_echo "$at_srcdir/ofproto.at:2409: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2409"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2368"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2409"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2368: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2368"
+$as_echo "$at_srcdir/ofproto.at:2409: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2409"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2368"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2409"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95084,13 +95568,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_752
-#AT_START_753
-at_fn_group_banner 753 'ofproto.at:2371' \
+#AT_STOP_754
+#AT_START_755
+at_fn_group_banner 755 'ofproto.at:2412' \
   "ofproto - asynchronous message control (OpenFlow 1.5)" "" 49
 at_xfail=no
 (
-  $as_echo "753. $at_setup_line: testing $at_desc ..."
+  $as_echo "755. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -95100,29 +95584,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2372: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2372"
+$as_echo "$at_srcdir/ofproto.at:2413: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2413"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2372"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2413"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2372: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2372"
+$as_echo "$at_srcdir/ofproto.at:2413: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2413"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2372"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2413"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -95132,49 +95616,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2372: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2413: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2372"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2413"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2372"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2413"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2372: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2372"
+$as_echo "$at_srcdir/ofproto.at:2413: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2413"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2372"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2413"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2372: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2372"
+$as_echo "$at_srcdir/ofproto.at:2413: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2413"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2372"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2413"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -95186,14 +95670,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2372: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2413: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2372"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2413"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -95201,12 +95685,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2372"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2413"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95215,15 +95699,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2372: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2372"
+$as_echo "$at_srcdir/ofproto.at:2413: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2413"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2372"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2413"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95231,15 +95715,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2373: ovs-ofctl -O OpenFlow15 monitor br0 --detach --no-chdir --pidfile"
-at_fn_check_prepare_trace "ofproto.at:2373"
+$as_echo "$at_srcdir/ofproto.at:2414: ovs-ofctl -O OpenFlow15 monitor br0 --detach --no-chdir --pidfile"
+at_fn_check_prepare_trace "ofproto.at:2414"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2373"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2414"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95288,29 +95772,29 @@
      speed: 0 Mbps now, 0 Mbps max"
     fi
 
-    $as_echo "ofproto.at:2417" >"$at_check_line_file"
+    $as_echo "ofproto.at:2458" >"$at_check_line_file"
 (test X"$1" != X) \
-  && at_fn_check_skip 99 "$at_srcdir/ofproto.at:2417"
+  && at_fn_check_skip 99 "$at_srcdir/ofproto.at:2458"
 
     ovs-appctl -t ovs-ofctl ofctl/barrier
     echo >>expout "OFPT_BARRIER_REPLY (OF1.5):"
 
     { set +x
-$as_echo "$at_srcdir/ofproto.at:2422: sed '
+$as_echo "$at_srcdir/ofproto.at:2463: sed '
 s/ (xid=0x[0-9a-fA-F]*)//
 s/ *duration.*//
 s/00:0.\$/00:0x/' < monitor.log"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2422"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2463"
 ( $at_check_trace; sed '
 s/ (xid=0x[0-9a-fA-F]*)//
 s/ *duration.*//
 s/00:0.$/00:0x/' < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2422"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2463"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95330,45 +95814,45 @@
 
 ovs-appctl -t ovs-ofctl exit
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2441: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2441"
+$as_echo "$at_srcdir/ofproto.at:2482: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2482"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2441"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2482"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2441: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2441"
+$as_echo "$at_srcdir/ofproto.at:2482: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2482"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2441"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2482"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2441: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2441"
+$as_echo "$at_srcdir/ofproto.at:2482: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2482"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2441"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2482"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95378,13 +95862,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_753
-#AT_START_754
-at_fn_group_banner 754 'ofproto.at:2446' \
+#AT_STOP_755
+#AT_START_756
+at_fn_group_banner 756 'ofproto.at:2487' \
   "ofproto - controller role (OpenFlow 1.2)" "       " 49
 at_xfail=no
 (
-  $as_echo "754. $at_setup_line: testing $at_desc ..."
+  $as_echo "756. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -95394,29 +95878,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2447: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2447"
+$as_echo "$at_srcdir/ofproto.at:2488: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2488"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2447"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2488"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2447: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2447"
+$as_echo "$at_srcdir/ofproto.at:2488: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2488"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2447"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2488"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -95426,49 +95910,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2447: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2488: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2447"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2488"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2447"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2488"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2447: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2447"
+$as_echo "$at_srcdir/ofproto.at:2488: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2488"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2447"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2488"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2447: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2447"
+$as_echo "$at_srcdir/ofproto.at:2488: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2488"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2447"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2488"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -95480,14 +95964,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2447: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2488: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2447"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2488"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -95495,12 +95979,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2447"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2488"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95509,15 +95993,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2447: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2447"
+$as_echo "$at_srcdir/ofproto.at:2488: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2488"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2447"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2488"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95539,15 +96023,15 @@
 
 for i in 1 2; do
      { set +x
-$as_echo "$at_srcdir/ofproto.at:2458: ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile=\`pwd\`/c\$i.pid --unixctl=\`pwd\`/c\$i"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto.at:2458"
+$as_echo "$at_srcdir/ofproto.at:2499: ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile=\`pwd\`/c\$i.pid --unixctl=\`pwd\`/c\$i"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto.at:2499"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile=`pwd`/c$i.pid --unixctl=`pwd`/c$i
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2458"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2499"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -95601,15 +96085,15 @@
 for i in 1 2; do
     cp expout$i expout
     { set +x
-$as_echo "$at_srcdir/ofproto.at:2500: grep -v '^send:' monitor\$i.log | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2500"
+$as_echo "$at_srcdir/ofproto.at:2541: grep -v '^send:' monitor\$i.log | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2541"
 ( $at_check_trace; grep -v '^send:' monitor$i.log | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2500"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2541"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -95623,15 +96107,15 @@
 
     cp experr$i expout
     { set +x
-$as_echo "$at_srcdir/ofproto.at:2502: grep '^send:' monitor\$i.log | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2502"
+$as_echo "$at_srcdir/ofproto.at:2543: grep '^send:' monitor\$i.log | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2543"
 ( $at_check_trace; grep '^send:' monitor$i.log | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2502"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2543"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -95645,15 +96129,15 @@
 
 done
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2504: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2504"
+$as_echo "$at_srcdir/ofproto.at:2545: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2545"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2504"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2545"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -95666,15 +96150,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2504: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2504"
+$as_echo "$at_srcdir/ofproto.at:2545: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2545"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2504"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2545"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -95687,15 +96171,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2504: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2504"
+$as_echo "$at_srcdir/ofproto.at:2545: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2545"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2504"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2545"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -95711,13 +96195,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_754
-#AT_START_755
-at_fn_group_banner 755 'ofproto.at:2511' \
+#AT_STOP_756
+#AT_START_757
+at_fn_group_banner 757 'ofproto.at:2552' \
   "ofproto - controller role (OpenFlow 1.4)" "       " 49
 at_xfail=no
 (
-  $as_echo "755. $at_setup_line: testing $at_desc ..."
+  $as_echo "757. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -95727,29 +96211,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2512: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2512"
+$as_echo "$at_srcdir/ofproto.at:2553: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2553"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2512"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2553"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2512: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2512"
+$as_echo "$at_srcdir/ofproto.at:2553: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2553"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2512"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2553"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -95759,49 +96243,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2512: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2553: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2512"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2553"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2512"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2553"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2512: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2512"
+$as_echo "$at_srcdir/ofproto.at:2553: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2553"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2512"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2553"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2512: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2512"
+$as_echo "$at_srcdir/ofproto.at:2553: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2553"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2512"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2553"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -95813,14 +96297,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2512: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2553: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2512"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2553"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -95828,12 +96312,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2512"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2553"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95842,15 +96326,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2512: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2512"
+$as_echo "$at_srcdir/ofproto.at:2553: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2553"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2512"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2553"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95872,15 +96356,15 @@
 
 for i in 1 2; do
      { set +x
-$as_echo "$at_srcdir/ofproto.at:2523: ovs-ofctl -O OpenFlow14 monitor br0 --detach --no-chdir --pidfile=\`pwd\`/c\$i.pid --unixctl=\`pwd\`/c\$i"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto.at:2523"
+$as_echo "$at_srcdir/ofproto.at:2564: ovs-ofctl -O OpenFlow14 monitor br0 --detach --no-chdir --pidfile=\`pwd\`/c\$i.pid --unixctl=\`pwd\`/c\$i"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto.at:2564"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 monitor br0 --detach --no-chdir --pidfile=`pwd`/c$i.pid --unixctl=`pwd`/c$i
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2523"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2564"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -95935,15 +96419,15 @@
 for i in 1 2; do
     cp expout$i expout
     { set +x
-$as_echo "$at_srcdir/ofproto.at:2566: grep -v '^send:' monitor\$i.log | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2566"
+$as_echo "$at_srcdir/ofproto.at:2607: grep -v '^send:' monitor\$i.log | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2607"
 ( $at_check_trace; grep -v '^send:' monitor$i.log | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2566"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2607"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -95957,15 +96441,15 @@
 
     cp experr$i expout
     { set +x
-$as_echo "$at_srcdir/ofproto.at:2568: grep '^send:' monitor\$i.log | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2568"
+$as_echo "$at_srcdir/ofproto.at:2609: grep '^send:' monitor\$i.log | sed 's/ (xid=0x[0-9a-fA-F]*)//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2609"
 ( $at_check_trace; grep '^send:' monitor$i.log | sed 's/ (xid=0x[0-9a-fA-F]*)//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2568"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2609"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -95979,15 +96463,15 @@
 
 done
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2570: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2570"
+$as_echo "$at_srcdir/ofproto.at:2611: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2611"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2570"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2611"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96000,15 +96484,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2570: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2570"
+$as_echo "$at_srcdir/ofproto.at:2611: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2611"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2570"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2611"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96021,15 +96505,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2570: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2570"
+$as_echo "$at_srcdir/ofproto.at:2611: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2611"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2570"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2611"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96045,13 +96529,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_755
-#AT_START_756
-at_fn_group_banner 756 'ofproto.at:2577' \
+#AT_STOP_757
+#AT_START_758
+at_fn_group_banner 758 'ofproto.at:2618' \
   "ofproto - packet-out from controller (OpenFlow 1.0)" "" 49
 at_xfail=no
 (
-  $as_echo "756. $at_setup_line: testing $at_desc ..."
+  $as_echo "758. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -96061,29 +96545,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2578: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2578"
+$as_echo "$at_srcdir/ofproto.at:2619: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2619"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2578"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2619"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2578: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2578"
+$as_echo "$at_srcdir/ofproto.at:2619: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2619"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2578"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2619"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -96093,49 +96577,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2578: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2619: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2578"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2619"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2578"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2619"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2578: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2578"
+$as_echo "$at_srcdir/ofproto.at:2619: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2619"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2578"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2619"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2578: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2578"
+$as_echo "$at_srcdir/ofproto.at:2619: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2619"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2578"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2619"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -96147,14 +96631,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2578: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2619: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2578"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2619"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -96162,12 +96646,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2578"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2619"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96176,15 +96660,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2578: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2578"
+$as_echo "$at_srcdir/ofproto.at:2619: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2619"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2578"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2619"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96196,15 +96680,15 @@
 
 # Start a monitor listening for packet-ins.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2582: ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile"
-at_fn_check_prepare_trace "ofproto.at:2582"
+$as_echo "$at_srcdir/ofproto.at:2623: ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile"
+at_fn_check_prepare_trace "ofproto.at:2623"
 ( $at_check_trace; ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2582"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2623"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96217,15 +96701,15 @@
 
 # Send some packet-outs with OFPP_NONE and OFPP_CONTROLLER (65533) as in_port.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2589: ovs-ofctl packet-out br0 none controller,1 '0001020304050010203040501234'"
-at_fn_check_prepare_trace "ofproto.at:2589"
+$as_echo "$at_srcdir/ofproto.at:2630: ovs-ofctl packet-out br0 none controller,1 '0001020304050010203040501234'"
+at_fn_check_prepare_trace "ofproto.at:2630"
 ( $at_check_trace; ovs-ofctl packet-out br0 none controller,1 '0001020304050010203040501234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2589"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2630"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96233,15 +96717,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2590: ovs-ofctl packet-out br0 controller controller,1 '0001020304050010203040505678'"
-at_fn_check_prepare_trace "ofproto.at:2590"
+$as_echo "$at_srcdir/ofproto.at:2631: ovs-ofctl packet-out br0 controller controller,1 '0001020304050010203040505678'"
+at_fn_check_prepare_trace "ofproto.at:2631"
 ( $at_check_trace; ovs-ofctl packet-out br0 controller controller,1 '0001020304050010203040505678'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2590"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2631"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96256,10 +96740,10 @@
 ovs-ofctl dump-ports br0
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2598: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
-at_fn_check_prepare_trace "ofproto.at:2598"
+$as_echo "$at_srcdir/ofproto.at:2639: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
+at_fn_check_prepare_trace "ofproto.at:2639"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -96270,7 +96754,7 @@
 OFPT_BARRIER_REPLY:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2598"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2639"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96279,15 +96763,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2606: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2606"
+$as_echo "$at_srcdir/ofproto.at:2647: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2647"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2606"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2647"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96295,15 +96779,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2606: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2606"
+$as_echo "$at_srcdir/ofproto.at:2647: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2647"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2606"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2647"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96311,15 +96795,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2606: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2606"
+$as_echo "$at_srcdir/ofproto.at:2647: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2647"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2606"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2647"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96330,13 +96814,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_756
-#AT_START_757
-at_fn_group_banner 757 'ofproto.at:2613' \
+#AT_STOP_758
+#AT_START_759
+at_fn_group_banner 759 'ofproto.at:2654' \
   "ofproto - packet-out from controller (OpenFlow 1.2)" "" 49
 at_xfail=no
 (
-  $as_echo "757. $at_setup_line: testing $at_desc ..."
+  $as_echo "759. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -96346,29 +96830,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2614: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2614"
+$as_echo "$at_srcdir/ofproto.at:2655: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2655"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2614"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2655"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2614: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2614"
+$as_echo "$at_srcdir/ofproto.at:2655: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2655"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2614"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2655"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -96378,49 +96862,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2614: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2655: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2614"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2655"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2614"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2655"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2614: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2614"
+$as_echo "$at_srcdir/ofproto.at:2655: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2655"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2614"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2655"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2614: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2614"
+$as_echo "$at_srcdir/ofproto.at:2655: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2655"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2614"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2655"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -96432,14 +96916,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2614: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2655: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2614"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2655"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -96447,12 +96931,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2614"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2655"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96461,15 +96945,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2614: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2614"
+$as_echo "$at_srcdir/ofproto.at:2655: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2655"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2614"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2655"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96479,15 +96963,15 @@
 
 # Start a monitor listening for packet-ins.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2617: ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile"
-at_fn_check_prepare_trace "ofproto.at:2617"
+$as_echo "$at_srcdir/ofproto.at:2658: ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile"
+at_fn_check_prepare_trace "ofproto.at:2658"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2617"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2658"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96500,15 +96984,15 @@
 
 # Send some packet-outs with OFPP_NONE and OFPP_CONTROLLER (65533) as in_port.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2624: ovs-ofctl -O OpenFlow12 packet-out br0 none controller '0001020304050010203040501234'"
-at_fn_check_prepare_trace "ofproto.at:2624"
+$as_echo "$at_srcdir/ofproto.at:2665: ovs-ofctl -O OpenFlow12 packet-out br0 none controller '0001020304050010203040501234'"
+at_fn_check_prepare_trace "ofproto.at:2665"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 packet-out br0 none controller '0001020304050010203040501234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2624"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2665"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96516,15 +97000,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2625: ovs-ofctl -O OpenFlow12 packet-out br0 4294967293 controller '0001020304050010203040505678'"
-at_fn_check_prepare_trace "ofproto.at:2625"
+$as_echo "$at_srcdir/ofproto.at:2666: ovs-ofctl -O OpenFlow12 packet-out br0 4294967293 controller '0001020304050010203040505678'"
+at_fn_check_prepare_trace "ofproto.at:2666"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 packet-out br0 4294967293 controller '0001020304050010203040505678'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2625"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2666"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96537,10 +97021,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2631: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
-at_fn_check_prepare_trace "ofproto.at:2631"
+$as_echo "$at_srcdir/ofproto.at:2672: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
+at_fn_check_prepare_trace "ofproto.at:2672"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -96551,7 +97035,7 @@
 OFPT_BARRIER_REPLY (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2631"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2672"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96560,15 +97044,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2639: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2639"
+$as_echo "$at_srcdir/ofproto.at:2680: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2680"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2639"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2680"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96576,15 +97060,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2639: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2639"
+$as_echo "$at_srcdir/ofproto.at:2680: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2680"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2639"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2680"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96592,15 +97076,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2639: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2639"
+$as_echo "$at_srcdir/ofproto.at:2680: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2680"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2639"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2680"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96611,13 +97095,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_757
-#AT_START_758
-at_fn_group_banner 758 'ofproto.at:2646' \
+#AT_STOP_759
+#AT_START_760
+at_fn_group_banner 760 'ofproto.at:2687' \
   "ofproto - packet-out from controller (OpenFlow 1.1)" "" 49
 at_xfail=no
 (
-  $as_echo "758. $at_setup_line: testing $at_desc ..."
+  $as_echo "760. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -96627,29 +97111,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2647: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2647"
+$as_echo "$at_srcdir/ofproto.at:2688: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2688"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2647"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2688"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2647: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2647"
+$as_echo "$at_srcdir/ofproto.at:2688: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2688"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2647"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2688"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -96659,49 +97143,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2647: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2688: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2647"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2688"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2647"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2688"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2647: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2647"
+$as_echo "$at_srcdir/ofproto.at:2688: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2688"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2647"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2688"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2647: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2647"
+$as_echo "$at_srcdir/ofproto.at:2688: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2688"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2647"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2688"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -96713,14 +97197,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2647: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2688: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2647"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2688"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -96728,12 +97212,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2647"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2688"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96742,15 +97226,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2647: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2647"
+$as_echo "$at_srcdir/ofproto.at:2688: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2688"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2647"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2688"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96760,15 +97244,15 @@
 
 # Start a monitor listening for packet-ins.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2650: ovs-ofctl -O OpenFlow11 monitor br0 --detach --no-chdir --pidfile"
-at_fn_check_prepare_trace "ofproto.at:2650"
+$as_echo "$at_srcdir/ofproto.at:2691: ovs-ofctl -O OpenFlow11 monitor br0 --detach --no-chdir --pidfile"
+at_fn_check_prepare_trace "ofproto.at:2691"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2650"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2691"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96781,15 +97265,15 @@
 
 # Send some packet-outs with OFPP_NONE and OFPP_CONTROLLER (65533) as in_port.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2657: ovs-ofctl -O OpenFlow11 packet-out br0 none controller '0001020304050010203040501234'"
-at_fn_check_prepare_trace "ofproto.at:2657"
+$as_echo "$at_srcdir/ofproto.at:2698: ovs-ofctl -O OpenFlow11 packet-out br0 none controller '0001020304050010203040501234'"
+at_fn_check_prepare_trace "ofproto.at:2698"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 packet-out br0 none controller '0001020304050010203040501234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2657"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2698"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96797,15 +97281,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2658: ovs-ofctl -O OpenFlow11 packet-out br0 4294967293 controller '0001020304050010203040505678'"
-at_fn_check_prepare_trace "ofproto.at:2658"
+$as_echo "$at_srcdir/ofproto.at:2699: ovs-ofctl -O OpenFlow11 packet-out br0 4294967293 controller '0001020304050010203040505678'"
+at_fn_check_prepare_trace "ofproto.at:2699"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 packet-out br0 4294967293 controller '0001020304050010203040505678'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2658"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2699"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96818,10 +97302,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2664: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
-at_fn_check_prepare_trace "ofproto.at:2664"
+$as_echo "$at_srcdir/ofproto.at:2705: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
+at_fn_check_prepare_trace "ofproto.at:2705"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -96832,7 +97316,7 @@
 OFPT_BARRIER_REPLY (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2664"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2705"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96841,15 +97325,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2672: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2672"
+$as_echo "$at_srcdir/ofproto.at:2713: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2713"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2672"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2713"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96857,15 +97341,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2672: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2672"
+$as_echo "$at_srcdir/ofproto.at:2713: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2713"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2672"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2713"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96873,15 +97357,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2672: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2672"
+$as_echo "$at_srcdir/ofproto.at:2713: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2713"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2672"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2713"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -96892,13 +97376,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_758
-#AT_START_759
-at_fn_group_banner 759 'ofproto.at:2677' \
+#AT_STOP_760
+#AT_START_761
+at_fn_group_banner 761 'ofproto.at:2718' \
   "ofproto - packet-out with metadata (NXM)" "       " 49
 at_xfail=no
 (
-  $as_echo "759. $at_setup_line: testing $at_desc ..."
+  $as_echo "761. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -96908,29 +97392,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2678: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2678"
+$as_echo "$at_srcdir/ofproto.at:2719: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2719"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2678"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2719"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2678: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2678"
+$as_echo "$at_srcdir/ofproto.at:2719: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2719"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2678"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2719"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -96940,49 +97424,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2678: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2719: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2678"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2719"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2678"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2719"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2678: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2678"
+$as_echo "$at_srcdir/ofproto.at:2719: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2719"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2678"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2719"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2678: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2678"
+$as_echo "$at_srcdir/ofproto.at:2719: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2719"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2678"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2719"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -96994,14 +97478,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2678: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2719: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2678"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2719"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -97009,12 +97493,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2678"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2719"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97023,15 +97507,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2678: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2678"
+$as_echo "$at_srcdir/ofproto.at:2719: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2719"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2678"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2719"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97041,15 +97525,15 @@
 
 # Start a monitor listening for packet-ins.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2681: ovs-ofctl -P nxm monitor br0 --detach --no-chdir --pidfile"
-at_fn_check_prepare_trace "ofproto.at:2681"
+$as_echo "$at_srcdir/ofproto.at:2722: ovs-ofctl -P nxm monitor br0 --detach --no-chdir --pidfile"
+at_fn_check_prepare_trace "ofproto.at:2722"
 ( $at_check_trace; ovs-ofctl -P nxm monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2681"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2722"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97062,15 +97546,15 @@
 
 # Send a packet-out with a load action to set some metadata, and forward to controller
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2688: ovs-ofctl packet-out br0 controller 'load(0xfafafafa5a5a5a5a->OXM_OF_METADATA[0..63]), load(0xaa->NXM_NX_PKT_MARK[]), controller' '0001020304050010203040501234'"
-at_fn_check_prepare_trace "ofproto.at:2688"
+$as_echo "$at_srcdir/ofproto.at:2729: ovs-ofctl packet-out br0 controller 'load(0xfafafafa5a5a5a5a->OXM_OF_METADATA[0..63]), load(0xaa->NXM_NX_PKT_MARK[]), controller' '0001020304050010203040501234'"
+at_fn_check_prepare_trace "ofproto.at:2729"
 ( $at_check_trace; ovs-ofctl packet-out br0 controller 'load(0xfafafafa5a5a5a5a->OXM_OF_METADATA[0..63]), load(0xaa->NXM_NX_PKT_MARK[]), controller' '0001020304050010203040501234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2688"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2729"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97083,10 +97567,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2694: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
-at_fn_check_prepare_trace "ofproto.at:2694"
+$as_echo "$at_srcdir/ofproto.at:2735: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
+at_fn_check_prepare_trace "ofproto.at:2735"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -97095,7 +97579,7 @@
 OFPT_BARRIER_REPLY:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2694"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2735"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97104,15 +97588,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2700: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2700"
+$as_echo "$at_srcdir/ofproto.at:2741: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2741"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2700"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2741"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97120,15 +97604,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2700: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2700"
+$as_echo "$at_srcdir/ofproto.at:2741: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2741"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2700"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2741"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97136,15 +97620,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2700: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2700"
+$as_echo "$at_srcdir/ofproto.at:2741: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2741"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2700"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2741"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97155,13 +97639,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_759
-#AT_START_760
-at_fn_group_banner 760 'ofproto.at:2705' \
+#AT_STOP_761
+#AT_START_762
+at_fn_group_banner 762 'ofproto.at:2746' \
   "ofproto - packet-out with metadata (OpenFlow 1.2)" "" 49
 at_xfail=no
 (
-  $as_echo "760. $at_setup_line: testing $at_desc ..."
+  $as_echo "762. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -97171,29 +97655,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2706: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2706"
+$as_echo "$at_srcdir/ofproto.at:2747: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2747"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2706"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2747"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2706: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2706"
+$as_echo "$at_srcdir/ofproto.at:2747: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2747"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2706"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2747"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -97203,49 +97687,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2706: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2747: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2706"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2747"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2706"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2747"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2706: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2706"
+$as_echo "$at_srcdir/ofproto.at:2747: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2747"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2706"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2747"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2706: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2706"
+$as_echo "$at_srcdir/ofproto.at:2747: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2747"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2706"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2747"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -97257,14 +97741,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2706: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2747: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2706"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2747"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -97272,12 +97756,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2706"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2747"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97286,15 +97770,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2706: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2706"
+$as_echo "$at_srcdir/ofproto.at:2747: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2747"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2706"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2747"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97304,15 +97788,15 @@
 
 # Start a monitor listening for packet-ins.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2709: ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile"
-at_fn_check_prepare_trace "ofproto.at:2709"
+$as_echo "$at_srcdir/ofproto.at:2750: ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile"
+at_fn_check_prepare_trace "ofproto.at:2750"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2709"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2750"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97325,15 +97809,15 @@
 
 # Send a packet-out with a set-field action to set some metadata, and forward to controller
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2716: ovs-ofctl -O OpenFlow12 packet-out br0 none 'set_field:0xfafafafa5a5a5a5a->metadata, controller' '0001020304050010203040501234'"
-at_fn_check_prepare_trace "ofproto.at:2716"
+$as_echo "$at_srcdir/ofproto.at:2757: ovs-ofctl -O OpenFlow12 packet-out br0 none 'set_field:0xfafafafa5a5a5a5a->metadata, controller' '0001020304050010203040501234'"
+at_fn_check_prepare_trace "ofproto.at:2757"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 packet-out br0 none 'set_field:0xfafafafa5a5a5a5a->metadata, controller' '0001020304050010203040501234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2716"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2757"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97346,10 +97830,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2722: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
-at_fn_check_prepare_trace "ofproto.at:2722"
+$as_echo "$at_srcdir/ofproto.at:2763: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
+at_fn_check_prepare_trace "ofproto.at:2763"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -97358,7 +97842,7 @@
 OFPT_BARRIER_REPLY (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2722"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2763"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97367,15 +97851,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2728: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2728"
+$as_echo "$at_srcdir/ofproto.at:2769: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2769"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2728"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2769"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97383,15 +97867,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2728: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2728"
+$as_echo "$at_srcdir/ofproto.at:2769: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2769"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2728"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2769"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97399,15 +97883,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2728: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2728"
+$as_echo "$at_srcdir/ofproto.at:2769: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2769"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2728"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2769"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97418,13 +97902,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_760
-#AT_START_761
-at_fn_group_banner 761 'ofproto.at:2733' \
+#AT_STOP_762
+#AT_START_763
+at_fn_group_banner 763 'ofproto.at:2774' \
   "ofproto - packet-out with metadata and dual set_field (OpenFlow 1.3)" "" 49
 at_xfail=no
 (
-  $as_echo "761. $at_setup_line: testing $at_desc ..."
+  $as_echo "763. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -97434,29 +97918,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2734: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2734"
+$as_echo "$at_srcdir/ofproto.at:2775: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2775"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2734"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2775"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2734: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2734"
+$as_echo "$at_srcdir/ofproto.at:2775: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2775"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2734"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2775"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -97466,49 +97950,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2734: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2775: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2734"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2775"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2734"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2775"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2734: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2734"
+$as_echo "$at_srcdir/ofproto.at:2775: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2775"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2734"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2775"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2734: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2734"
+$as_echo "$at_srcdir/ofproto.at:2775: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2775"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2734"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2775"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -97520,14 +98004,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2734: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2775: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2734"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2775"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -97535,12 +98019,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2734"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2775"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97549,15 +98033,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2734: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2734"
+$as_echo "$at_srcdir/ofproto.at:2775: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2775"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2734"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2775"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97567,15 +98051,15 @@
 
 # Start a monitor listening for packet-ins.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2737: ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile"
-at_fn_check_prepare_trace "ofproto.at:2737"
+$as_echo "$at_srcdir/ofproto.at:2778: ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile"
+at_fn_check_prepare_trace "ofproto.at:2778"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2737"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2778"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97588,15 +98072,15 @@
 
 # Send a packet-out with a couple of set-field action to set some metadata, and forward to controller
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2744: ovs-ofctl -O OpenFlow13 packet-out br0 none 'set_field:0xfafafafa5a5a5a5a->metadata, set_field:0x6b->metadata, controller' '0001020304050010203040501234'"
-at_fn_check_prepare_trace "ofproto.at:2744"
+$as_echo "$at_srcdir/ofproto.at:2785: ovs-ofctl -O OpenFlow13 packet-out br0 none 'set_field:0xfafafafa5a5a5a5a->metadata, set_field:0x6b->metadata, controller' '0001020304050010203040501234'"
+at_fn_check_prepare_trace "ofproto.at:2785"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 packet-out br0 none 'set_field:0xfafafafa5a5a5a5a->metadata, set_field:0x6b->metadata, controller' '0001020304050010203040501234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2744"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2785"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97609,10 +98093,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2750: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
-at_fn_check_prepare_trace "ofproto.at:2750"
+$as_echo "$at_srcdir/ofproto.at:2791: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
+at_fn_check_prepare_trace "ofproto.at:2791"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -97621,7 +98105,7 @@
 OFPT_BARRIER_REPLY (OF1.3):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2750"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2791"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97630,15 +98114,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2756: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2756"
+$as_echo "$at_srcdir/ofproto.at:2797: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2797"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2756"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97646,15 +98130,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2756: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2756"
+$as_echo "$at_srcdir/ofproto.at:2797: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2797"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2756"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97662,15 +98146,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2756: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2756"
+$as_echo "$at_srcdir/ofproto.at:2797: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2797"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2756"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97681,13 +98165,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_761
-#AT_START_762
-at_fn_group_banner 762 'ofproto.at:2760' \
+#AT_STOP_763
+#AT_START_764
+at_fn_group_banner 764 'ofproto.at:2801' \
   "ofproto - packet-out with tunnel metadata (OpenFlow 1.2)" "" 49
 at_xfail=no
 (
-  $as_echo "762. $at_setup_line: testing $at_desc ..."
+  $as_echo "764. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -97697,29 +98181,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2761: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2761"
+$as_echo "$at_srcdir/ofproto.at:2802: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2802"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2802"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2761: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2761"
+$as_echo "$at_srcdir/ofproto.at:2802: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2802"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2802"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -97729,49 +98213,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2761: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2802: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2761"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2802"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2802"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2761: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2761"
+$as_echo "$at_srcdir/ofproto.at:2802: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2802"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2802"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2761: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2761"
+$as_echo "$at_srcdir/ofproto.at:2802: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2802"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2802"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -97783,14 +98267,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2761: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2802: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2761"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2802"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -97798,12 +98282,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2802"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97812,15 +98296,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2761: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2761"
+$as_echo "$at_srcdir/ofproto.at:2802: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2802"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2802"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97830,15 +98314,15 @@
 
 # Start a monitor listening for packet-ins.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2764: ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile"
-at_fn_check_prepare_trace "ofproto.at:2764"
+$as_echo "$at_srcdir/ofproto.at:2805: ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile"
+at_fn_check_prepare_trace "ofproto.at:2805"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2764"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2805"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97851,15 +98335,15 @@
 
 # Send a packet-out with set field actions to set some tunnel metadata, and forward to controller
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2771: ovs-ofctl -O OpenFlow12 packet-out br0 none 'set_field:127.0.0.1->tun_src,set_field:0x01020304->tun_id,set_field:192.168.0.1->tun_dst, controller' '0001020304050010203040501234'"
-at_fn_check_prepare_trace "ofproto.at:2771"
+$as_echo "$at_srcdir/ofproto.at:2812: ovs-ofctl -O OpenFlow12 packet-out br0 none 'set_field:127.0.0.1->tun_src,set_field:0x01020304->tun_id,set_field:192.168.0.1->tun_dst, controller' '0001020304050010203040501234'"
+at_fn_check_prepare_trace "ofproto.at:2812"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 packet-out br0 none 'set_field:127.0.0.1->tun_src,set_field:0x01020304->tun_id,set_field:192.168.0.1->tun_dst, controller' '0001020304050010203040501234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2771"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2812"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97872,10 +98356,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2777: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
-at_fn_check_prepare_trace "ofproto.at:2777"
+$as_echo "$at_srcdir/ofproto.at:2818: sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log"
+at_fn_check_prepare_trace "ofproto.at:2818"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -97884,7 +98368,7 @@
 OFPT_BARRIER_REPLY (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2777"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2818"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97893,15 +98377,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2783: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2783"
+$as_echo "$at_srcdir/ofproto.at:2824: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2824"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2783"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2824"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97909,15 +98393,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2783: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2783"
+$as_echo "$at_srcdir/ofproto.at:2824: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2824"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2783"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2824"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97925,15 +98409,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2783: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2783"
+$as_echo "$at_srcdir/ofproto.at:2824: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2824"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2783"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2824"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -97944,13 +98428,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_762
-#AT_START_763
-at_fn_group_banner 763 'ofproto.at:2808' \
+#AT_STOP_764
+#AT_START_765
+at_fn_group_banner 765 'ofproto.at:2849' \
   "ofproto - flow monitoring" "                      " 49
 at_xfail=no
 (
-  $as_echo "763. $at_setup_line: testing $at_desc ..."
+  $as_echo "765. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -97961,29 +98445,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2810: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2810"
+$as_echo "$at_srcdir/ofproto.at:2851: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2851"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2810"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2810: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2810"
+$as_echo "$at_srcdir/ofproto.at:2851: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2851"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2810"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -97993,49 +98477,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2810: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2851: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2810"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2851"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2810"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2810: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2810"
+$as_echo "$at_srcdir/ofproto.at:2851: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2851"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2810"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2851"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2810: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2810"
+$as_echo "$at_srcdir/ofproto.at:2851: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2851"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2810"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2851"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -98047,14 +98531,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2810: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2851: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2810"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2851"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -98062,12 +98546,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2810"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2851"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98076,15 +98560,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2810: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2810"
+$as_echo "$at_srcdir/ofproto.at:2851: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2851"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2810"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2851"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98099,10 +98583,10 @@
 
 ovs-appctl -t ovs-ofctl ofctl/barrier
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2818: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log"
-at_fn_check_prepare_trace "ofproto.at:2818"
+$as_echo "$at_srcdir/ofproto.at:2859: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log"
+at_fn_check_prepare_trace "ofproto.at:2859"
 ( $at_check_trace; sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -98111,7 +98595,7 @@
 OFPT_BARRIER_REPLY:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2818"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2859"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98147,10 +98631,10 @@
 ovs-ofctl del-flows br0
 ovs-appctl -t ovs-ofctl ofctl/barrier
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2851: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log | multiline_sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2851"
+$as_echo "$at_srcdir/ofproto.at:2892: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log | multiline_sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2892"
 ( $at_check_trace; sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log | multiline_sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -98221,7 +98705,7 @@
 OFPT_BARRIER_REPLY:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2851"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2892"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98237,17 +98721,17 @@
 ovs-appctl -t ovs-ofctl ofctl/send 010e004812345678003fffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000ffffffffffff0000
 ovs-appctl -t ovs-ofctl ofctl/barrier
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2926: ovs-ofctl dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2926"
+$as_echo "$at_srcdir/ofproto.at:2967: ovs-ofctl dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2967"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2926"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2967"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98255,10 +98739,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2928: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log | multiline_sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2928"
+$as_echo "$at_srcdir/ofproto.at:2969: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log | multiline_sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2969"
 ( $at_check_trace; sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log | multiline_sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -98274,7 +98758,7 @@
 OFPT_BARRIER_REPLY:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2928"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2969"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98284,15 +98768,15 @@
 
 ovs-appctl -t ovs-ofctl exit
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2942: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2942"
+$as_echo "$at_srcdir/ofproto.at:2983: check_logs "
+at_fn_check_prepare_trace "ofproto.at:2983"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2942"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98300,15 +98784,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2942: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2942"
+$as_echo "$at_srcdir/ofproto.at:2983: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:2983"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2942"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98316,15 +98800,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2942: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2942"
+$as_echo "$at_srcdir/ofproto.at:2983: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:2983"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2942"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98335,13 +98819,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_763
-#AT_START_764
-at_fn_group_banner 764 'ofproto.at:2945' \
+#AT_STOP_765
+#AT_START_766
+at_fn_group_banner 766 'ofproto.at:2986' \
   "ofproto - flow monitoring with !own" "            " 49
 at_xfail=no
 (
-  $as_echo "764. $at_setup_line: testing $at_desc ..."
+  $as_echo "766. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -98352,29 +98836,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2947: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2947"
+$as_echo "$at_srcdir/ofproto.at:2988: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2988"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2947"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2947: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2947"
+$as_echo "$at_srcdir/ofproto.at:2988: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2988"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2947"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -98384,49 +98868,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2947: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2988: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2947"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2988"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2947"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2947: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2947"
+$as_echo "$at_srcdir/ofproto.at:2988: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:2988"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2947"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2947: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2947"
+$as_echo "$at_srcdir/ofproto.at:2988: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:2988"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2947"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -98438,14 +98922,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2947: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:2988: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2947"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2988"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -98453,12 +98937,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2947"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98467,15 +98951,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2947: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2947"
+$as_echo "$at_srcdir/ofproto.at:2988: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:2988"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2947"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98490,10 +98974,10 @@
 
 ovs-appctl -t ovs-ofctl ofctl/barrier
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2955: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log"
-at_fn_check_prepare_trace "ofproto.at:2955"
+$as_echo "$at_srcdir/ofproto.at:2996: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log"
+at_fn_check_prepare_trace "ofproto.at:2996"
 ( $at_check_trace; sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -98502,7 +98986,7 @@
 OFPT_BARRIER_REPLY:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2955"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2996"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98518,17 +99002,17 @@
 ovs-appctl -t ovs-ofctl ofctl/send 010e004812345678003fffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000ffffffffffff0000
 ovs-appctl -t ovs-ofctl ofctl/barrier
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2968: ovs-ofctl dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:2968"
+$as_echo "$at_srcdir/ofproto.at:3009: ovs-ofctl dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3009"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2968"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3009"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98536,10 +99020,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2970: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log"
-at_fn_check_prepare_trace "ofproto.at:2970"
+$as_echo "$at_srcdir/ofproto.at:3011: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log"
+at_fn_check_prepare_trace "ofproto.at:3011"
 ( $at_check_trace; sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -98554,7 +99038,7 @@
 OFPT_BARRIER_REPLY:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2970"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3011"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98564,15 +99048,15 @@
 
 ovs-appctl -t ovs-ofctl exit
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2983: check_logs "
-at_fn_check_prepare_trace "ofproto.at:2983"
+$as_echo "$at_srcdir/ofproto.at:3024: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3024"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2983"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3024"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98580,15 +99064,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2983: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:2983"
+$as_echo "$at_srcdir/ofproto.at:3024: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3024"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2983"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3024"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98596,15 +99080,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2983: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:2983"
+$as_echo "$at_srcdir/ofproto.at:3024: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3024"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2983"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3024"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98615,13 +99099,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_764
-#AT_START_765
-at_fn_group_banner 765 'ofproto.at:2986' \
+#AT_STOP_766
+#AT_START_767
+at_fn_group_banner 767 'ofproto.at:3027' \
   "ofproto - flow monitoring with out_port" "        " 49
 at_xfail=no
 (
-  $as_echo "765. $at_setup_line: testing $at_desc ..."
+  $as_echo "767. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -98632,29 +99116,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2988: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:2988"
+$as_echo "$at_srcdir/ofproto.at:3029: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3029"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3029"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2988: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:2988"
+$as_echo "$at_srcdir/ofproto.at:3029: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3029"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3029"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -98664,49 +99148,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2988: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3029: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2988"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3029"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3029"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2988: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:2988"
+$as_echo "$at_srcdir/ofproto.at:3029: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3029"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3029"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2988: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:2988"
+$as_echo "$at_srcdir/ofproto.at:3029: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3029"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3029"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -98718,14 +99202,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:2988: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3029: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:2988"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3029"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -98733,12 +99217,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3029"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98747,15 +99231,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:2988: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:2988"
+$as_echo "$at_srcdir/ofproto.at:3029: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3029"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3029"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98772,10 +99256,10 @@
 
 ovs-appctl -t ovs-ofctl ofctl/barrier
 { set +x
-$as_echo "$at_srcdir/ofproto.at:2998: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log"
-at_fn_check_prepare_trace "ofproto.at:2998"
+$as_echo "$at_srcdir/ofproto.at:3039: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log"
+at_fn_check_prepare_trace "ofproto.at:3039"
 ( $at_check_trace; sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -98784,7 +99268,7 @@
 OFPT_BARRIER_REPLY:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:2998"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98808,10 +99292,10 @@
 ovs-appctl -t ovs-ofctl ofctl/barrier
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3019: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log"
-at_fn_check_prepare_trace "ofproto.at:3019"
+$as_echo "$at_srcdir/ofproto.at:3060: sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log"
+at_fn_check_prepare_trace "ofproto.at:3060"
 ( $at_check_trace; sed 's/ (xid=0x[1-9a-fA-F][0-9a-fA-F]*)//' monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -98829,7 +99313,7 @@
 OFPT_BARRIER_REPLY:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3019"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3060"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98839,15 +99323,15 @@
 
 ovs-appctl -t ovs-ofctl exit
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3035: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3035"
+$as_echo "$at_srcdir/ofproto.at:3076: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3076"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3035"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3076"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98855,15 +99339,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3035: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3035"
+$as_echo "$at_srcdir/ofproto.at:3076: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3076"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3035"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3076"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98871,15 +99355,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3035: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3035"
+$as_echo "$at_srcdir/ofproto.at:3076: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3076"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3035"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3076"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -98890,13 +99374,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_765
-#AT_START_766
-at_fn_group_banner 766 'ofproto.at:3038' \
+#AT_STOP_767
+#AT_START_768
+at_fn_group_banner 768 'ofproto.at:3079' \
   "ofproto - flow monitoring pause and resume" "     " 49
 at_xfail=no
 (
-  $as_echo "766. $at_setup_line: testing $at_desc ..."
+  $as_echo "768. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -98910,8 +99394,8 @@
     : # FreeBSD, NetBSD
 else
     # Don't know how to get maximum socket receive buffer on this OS
-    $as_echo "ofproto.at:3050" >"$at_check_line_file"
-at_fn_check_skip 77 "$at_srcdir/ofproto.at:3050"
+    $as_echo "ofproto.at:3091" >"$at_check_line_file"
+at_fn_check_skip 77 "$at_srcdir/ofproto.at:3091"
 fi
 # Calculate the total amount of queuing: rmem_max in the kernel, 128 kB
 # in ofproto sending userspace (see ofmonitor_flush() in connmgr.c).
@@ -98919,9 +99403,9 @@
 echo rmem_max=$rmem_max queue_size=$queue_size
 
 # If there's too much queuing skip the test to avoid timing out.
-$as_echo "ofproto.at:3058" >"$at_check_line_file"
+$as_echo "ofproto.at:3099" >"$at_check_line_file"
 (test $rmem_max -gt 1048576) \
-  && at_fn_check_skip 77 "$at_srcdir/ofproto.at:3058"
+  && at_fn_check_skip 77 "$at_srcdir/ofproto.at:3099"
 
 # Each flow update message takes up at least 48 bytes of space in queues
 # and in practice more than that.
@@ -98935,29 +99419,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3065: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3065"
+$as_echo "$at_srcdir/ofproto.at:3106: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3106"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3065"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3106"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3065: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3065"
+$as_echo "$at_srcdir/ofproto.at:3106: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3106"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3065"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3106"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -98967,49 +99451,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3065: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3106: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3065"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3106"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3065"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3106"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3065: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3065"
+$as_echo "$at_srcdir/ofproto.at:3106: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3106"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3065"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3106"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3065: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3065"
+$as_echo "$at_srcdir/ofproto.at:3106: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3106"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3065"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3106"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -99021,14 +99505,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3065: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3106: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3065"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3106"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -99036,12 +99520,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3065"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3106"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -99050,15 +99534,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3065: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3065"
+$as_echo "$at_srcdir/ofproto.at:3106: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3106"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3065"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3106"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -99084,15 +99568,15 @@
     }
 ') > flows.txt
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3080: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto.at:3080"
+$as_echo "$at_srcdir/ofproto.at:3121: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto.at:3121"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3080"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3121"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99101,15 +99585,15 @@
 
 # Check that multipart flow dumps work properly:
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3082: ovs-ofctl diff-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto.at:3082"
+$as_echo "$at_srcdir/ofproto.at:3123: ovs-ofctl diff-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto.at:3123"
 ( $at_check_trace; ovs-ofctl diff-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3082"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3123"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99117,15 +99601,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3083: ovs-ofctl add-flow br0 in_port=1,cookie=3,actions=drop"
-at_fn_check_prepare_trace "ofproto.at:3083"
+$as_echo "$at_srcdir/ofproto.at:3124: ovs-ofctl add-flow br0 in_port=1,cookie=3,actions=drop"
+at_fn_check_prepare_trace "ofproto.at:3124"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=1,cookie=3,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3083"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3124"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99133,15 +99617,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3084: ovs-ofctl mod-flows br0 in_port=2,cookie=2,actions=output:2"
-at_fn_check_prepare_trace "ofproto.at:3084"
+$as_echo "$at_srcdir/ofproto.at:3125: ovs-ofctl mod-flows br0 in_port=2,cookie=2,actions=output:2"
+at_fn_check_prepare_trace "ofproto.at:3125"
 ( $at_check_trace; ovs-ofctl mod-flows br0 in_port=2,cookie=2,actions=output:2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3084"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3125"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99149,15 +99633,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3085: ovs-ofctl del-flows br0 cookie=1/-1"
-at_fn_check_prepare_trace "ofproto.at:3085"
+$as_echo "$at_srcdir/ofproto.at:3126: ovs-ofctl del-flows br0 cookie=1/-1"
+at_fn_check_prepare_trace "ofproto.at:3126"
 ( $at_check_trace; ovs-ofctl del-flows br0 cookie=1/-1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3085"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3126"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99172,19 +99656,19 @@
 #    https://www.mail-archive.com/dev@openvswitch.org/msg27013.html
 #    https://www.mail-archive.com/dev@openvswitch.org/msg27675.html
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3093: ovs_wait_cond () { grep NXT_FLOW_MONITOR_RESUMED monitor.log
+$as_echo "$at_srcdir/ofproto.at:3134: ovs_wait_cond () { grep NXT_FLOW_MONITOR_RESUMED monitor.log
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3093"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3134"
 ( $at_check_trace; ovs_wait_cond () { grep NXT_FLOW_MONITOR_RESUMED monitor.log
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3093"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99200,15 +99684,15 @@
 deletes=`grep -c 'DELETED.*reg1=' monitor.log`
 echo adds=$adds deletes=$deletes
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3102: test \$adds -gt 100 && test \$adds -lt \$n_msgs"
-at_fn_check_prepare_dynamic "test $adds -gt 100 && test $adds -lt $n_msgs" "ofproto.at:3102"
+$as_echo "$at_srcdir/ofproto.at:3143: test \$adds -gt 100 && test \$adds -lt \$n_msgs"
+at_fn_check_prepare_dynamic "test $adds -gt 100 && test $adds -lt $n_msgs" "ofproto.at:3143"
 ( $at_check_trace; test $adds -gt 100 && test $adds -lt $n_msgs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3102"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3143"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99216,15 +99700,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3103: test \$adds = \$deletes"
-at_fn_check_prepare_dynamic "test $adds = $deletes" "ofproto.at:3103"
+$as_echo "$at_srcdir/ofproto.at:3144: test \$adds = \$deletes"
+at_fn_check_prepare_dynamic "test $adds = $deletes" "ofproto.at:3144"
 ( $at_check_trace; test $adds = $deletes
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3103"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99249,25 +99733,25 @@
 # as we change the hash function or change architecture.  Therefore,
 # we use a couple of tests below to accept both orders.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3121: ofctl_strip < monitor.log | sed -n -e '
+$as_echo "$at_srcdir/ofproto.at:3162: ofctl_strip < monitor.log | sed -n -e '
 /reg1=0x22\$/p
 /cookie=0x[23]/p
 /NXT_FLOW_MONITOR_PAUSED:/p
 /NXT_FLOW_MONITOR_RESUMED:/p
 ' > monitor.log.subset"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3121"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3162"
 ( $at_check_trace; ofctl_strip < monitor.log | sed -n -e '
 /reg1=0x22$/p
 /cookie=0x[23]/p
 /NXT_FLOW_MONITOR_PAUSED:/p
 /NXT_FLOW_MONITOR_RESUMED:/p
 ' > monitor.log.subset
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3121"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3162"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99275,10 +99759,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3127: grep -v MODIFIED monitor.log.subset"
-at_fn_check_prepare_trace "ofproto.at:3127"
+$as_echo "$at_srcdir/ofproto.at:3168: grep -v MODIFIED monitor.log.subset"
+at_fn_check_prepare_trace "ofproto.at:3168"
 ( $at_check_trace; grep -v MODIFIED monitor.log.subset
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -99289,7 +99773,7 @@
 NXT_FLOW_MONITOR_RESUMED:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3127"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3168"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99297,10 +99781,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3134: grep -v ADDED monitor.log.subset"
-at_fn_check_prepare_trace "ofproto.at:3134"
+$as_echo "$at_srcdir/ofproto.at:3175: grep -v ADDED monitor.log.subset"
+at_fn_check_prepare_trace "ofproto.at:3175"
 ( $at_check_trace; grep -v ADDED monitor.log.subset
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -99310,7 +99794,7 @@
 NXT_FLOW_MONITOR_RESUMED:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3134"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3175"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99319,15 +99803,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3141: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3141"
+$as_echo "$at_srcdir/ofproto.at:3182: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3182"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3141"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3182"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99335,15 +99819,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3141: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3141"
+$as_echo "$at_srcdir/ofproto.at:3182: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3182"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3141"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3182"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99351,15 +99835,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3141: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3141"
+$as_echo "$at_srcdir/ofproto.at:3182: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3182"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3141"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3182"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99370,13 +99854,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_766
-#AT_START_767
-at_fn_group_banner 767 'ofproto.at:3144' \
+#AT_STOP_768
+#AT_START_769
+at_fn_group_banner 769 'ofproto.at:3185' \
   "ofproto - event filtering (OpenFlow 1.3)" "       " 49
 at_xfail=no
 (
-  $as_echo "767. $at_setup_line: testing $at_desc ..."
+  $as_echo "769. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -99387,29 +99871,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3146: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3146"
+$as_echo "$at_srcdir/ofproto.at:3187: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3187"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3146"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3187"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3146: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3146"
+$as_echo "$at_srcdir/ofproto.at:3187: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3187"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3146"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3187"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -99419,49 +99903,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3146: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3187: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3146"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3187"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3146"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3187"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3146: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3146"
+$as_echo "$at_srcdir/ofproto.at:3187: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3187"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3146"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3187"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3146: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3146"
+$as_echo "$at_srcdir/ofproto.at:3187: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3187"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3146"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3187"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -99473,14 +99957,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3146: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3187: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3146"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3187"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -99488,12 +99972,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3146"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3187"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -99502,15 +99986,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3146: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3146"
+$as_echo "$at_srcdir/ofproto.at:3187: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3187"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3146"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3187"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -99531,10 +100015,10 @@
 EOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3160: ofctl_strip < monitor.log"
-at_fn_check_prepare_trace "ofproto.at:3160"
+$as_echo "$at_srcdir/ofproto.at:3201: ofctl_strip < monitor.log"
+at_fn_check_prepare_trace "ofproto.at:3201"
 ( $at_check_trace; ofctl_strip < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -99552,7 +100036,7 @@
 OFPT_BARRIER_REPLY (OF1.3):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3160"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99561,15 +100045,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3175: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3175"
+$as_echo "$at_srcdir/ofproto.at:3216: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3216"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3175"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3216"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99577,15 +100061,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3175: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3175"
+$as_echo "$at_srcdir/ofproto.at:3216: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3216"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3175"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3216"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99593,15 +100077,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3175: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3175"
+$as_echo "$at_srcdir/ofproto.at:3216: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3216"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3175"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3216"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -99612,13 +100096,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_767
-#AT_START_768
-at_fn_group_banner 768 'ofproto.at:3178' \
+#AT_STOP_769
+#AT_START_770
+at_fn_group_banner 770 'ofproto.at:3219' \
   "ofproto - ofport_request" "                       " 49
 at_xfail=no
 (
-  $as_echo "768. $at_setup_line: testing $at_desc ..."
+  $as_echo "770. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -99628,29 +100112,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3179: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3179"
+$as_echo "$at_srcdir/ofproto.at:3220: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3220"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3179"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3220"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3179: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3179"
+$as_echo "$at_srcdir/ofproto.at:3220: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3220"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3179"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3220"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -99660,49 +100144,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3179: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3220: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3179"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3220"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3179"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3220"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3179: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3179"
+$as_echo "$at_srcdir/ofproto.at:3220: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3220"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3179"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3220"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3179: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3179"
+$as_echo "$at_srcdir/ofproto.at:3220: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3220"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3179"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3220"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -99714,14 +100198,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3179: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3220: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3179"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3220"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -99729,12 +100213,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3179"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3220"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -99743,15 +100227,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3179: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3179"
+$as_echo "$at_srcdir/ofproto.at:3220: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3220"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3179"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3220"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -99771,17 +100255,17 @@
 		       get Interface p2 ofport -- \
 		       get Interface p3 ofport`
     { set +x
-$as_echo "$at_srcdir/ofproto.at:3189: echo \$ofports"
-at_fn_check_prepare_dynamic "echo $ofports" "ofproto.at:3189"
+$as_echo "$at_srcdir/ofproto.at:3230: echo \$ofports"
+at_fn_check_prepare_dynamic "echo $ofports" "ofproto.at:3230"
 ( $at_check_trace; echo $ofports
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "$1 $2 $3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3189"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3230"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -99807,15 +100291,15 @@
     echo $p1 $p2
 
     { set +x
-$as_echo "$at_srcdir/ofproto.at:3210: test \"\$p1\" != \"\$p2\""
-at_fn_check_prepare_dynamic "test \"$p1\" != \"$p2\"" "ofproto.at:3210"
+$as_echo "$at_srcdir/ofproto.at:3251: test \"\$p1\" != \"\$p2\""
+at_fn_check_prepare_dynamic "test \"$p1\" != \"$p2\"" "ofproto.at:3251"
 ( $at_check_trace; test "$p1" != "$p2"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3210"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3251"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -99824,15 +100308,15 @@
     if test "$1" = "$2" && test "$1" != '[]'; then
         # One port number must be the requested one.
 	{ set +x
-$as_echo "$at_srcdir/ofproto.at:3213: test \"\$p1\" = \"\$1\" || test \"\$p2\" = \"\$1\""
-at_fn_check_prepare_dynamic "test \"$p1\" = \"$1\" || test \"$p2\" = \"$1\"" "ofproto.at:3213"
+$as_echo "$at_srcdir/ofproto.at:3254: test \"\$p1\" = \"\$1\" || test \"\$p2\" = \"\$1\""
+at_fn_check_prepare_dynamic "test \"$p1\" = \"$1\" || test \"$p2\" = \"$1\"" "ofproto.at:3254"
 ( $at_check_trace; test "$p1" = "$1" || test "$p2" = "$1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3213"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3254"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -99841,30 +100325,30 @@
 	# The other port number must be different (already tested above).
     else
         { set +x
-$as_echo "$at_srcdir/ofproto.at:3216: test \"\$1\" = '[]' || test \"\$p1\" == \"\$1\""
-at_fn_check_prepare_dynamic "test \"$1\" = '[]' || test \"$p1\" == \"$1\"" "ofproto.at:3216"
+$as_echo "$at_srcdir/ofproto.at:3257: test \"\$1\" = '[]' || test \"\$p1\" == \"\$1\""
+at_fn_check_prepare_dynamic "test \"$1\" = '[]' || test \"$p1\" == \"$1\"" "ofproto.at:3257"
 ( $at_check_trace; test "$1" = '[]' || test "$p1" == "$1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3216"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3257"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
         { set +x
-$as_echo "$at_srcdir/ofproto.at:3217: test \"\$2\" = '[]' || test \"\$p2\" == \"\$2\""
-at_fn_check_prepare_dynamic "test \"$2\" = '[]' || test \"$p2\" == \"$2\"" "ofproto.at:3217"
+$as_echo "$at_srcdir/ofproto.at:3258: test \"\$2\" = '[]' || test \"\$p2\" == \"\$2\""
+at_fn_check_prepare_dynamic "test \"$2\" = '[]' || test \"$p2\" == \"$2\"" "ofproto.at:3258"
 ( $at_check_trace; test "$2" = '[]' || test "$p2" == "$2"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3217"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3258"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -99883,45 +100367,45 @@
     done
 done
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3230: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3230"
+$as_echo "$at_srcdir/ofproto.at:3271: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3271"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3230"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3230: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3230"
+$as_echo "$at_srcdir/ofproto.at:3271: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3271"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3230"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3230: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3230"
+$as_echo "$at_srcdir/ofproto.at:3271: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3271"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3230"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -99931,13 +100415,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_768
-#AT_START_769
-at_fn_group_banner 769 'ofproto.at:3234' \
+#AT_STOP_770
+#AT_START_771
+at_fn_group_banner 771 'ofproto.at:3275' \
   "ofproto - bundles, open (OpenFlow 1.4)" "         " 49
 at_xfail=no
 (
-  $as_echo "769. $at_setup_line: testing $at_desc ..."
+  $as_echo "771. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -99948,29 +100432,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3236: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3236"
+$as_echo "$at_srcdir/ofproto.at:3277: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3277"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3236"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3277"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3236: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3236"
+$as_echo "$at_srcdir/ofproto.at:3277: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3277"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3236"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3277"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -99980,49 +100464,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3236: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3277: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3236"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3277"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3236"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3277"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3236: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3236"
+$as_echo "$at_srcdir/ofproto.at:3277: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3277"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3236"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3236: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3236"
+$as_echo "$at_srcdir/ofproto.at:3277: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3277"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3236"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -100034,14 +100518,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3236: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3277: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3236"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3277"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -100049,12 +100533,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3236"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -100063,15 +100547,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3236: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3236"
+$as_echo "$at_srcdir/ofproto.at:3277: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3277"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3236"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -100089,10 +100573,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3247: ofctl_strip < monitor.log"
-at_fn_check_prepare_trace "ofproto.at:3247"
+$as_echo "$at_srcdir/ofproto.at:3288: ofctl_strip < monitor.log"
+at_fn_check_prepare_trace "ofproto.at:3288"
 ( $at_check_trace; ofctl_strip < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -100103,7 +100587,7 @@
 OFPT_BARRIER_REPLY (OF1.4):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3247"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3288"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100112,15 +100596,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3255: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3255"
+$as_echo "$at_srcdir/ofproto.at:3296: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3296"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3255"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3296"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100128,15 +100612,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3255: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3255"
+$as_echo "$at_srcdir/ofproto.at:3296: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3296"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3255"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3296"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100144,15 +100628,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3255: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3255"
+$as_echo "$at_srcdir/ofproto.at:3296: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3296"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3255"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3296"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100163,13 +100647,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_769
-#AT_START_770
-at_fn_group_banner 770 'ofproto.at:3258' \
+#AT_STOP_771
+#AT_START_772
+at_fn_group_banner 772 'ofproto.at:3299' \
   "ofproto - bundles, double open (OpenFlow 1.4)" "  " 49
 at_xfail=no
 (
-  $as_echo "770. $at_setup_line: testing $at_desc ..."
+  $as_echo "772. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -100180,29 +100664,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3260: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3260"
+$as_echo "$at_srcdir/ofproto.at:3301: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3301"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3260"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3301"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3260: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3260"
+$as_echo "$at_srcdir/ofproto.at:3301: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3301"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3260"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3301"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -100212,49 +100696,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3260: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3301: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3260"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3301"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3260"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3301"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3260: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3260"
+$as_echo "$at_srcdir/ofproto.at:3301: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3301"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3260"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3260: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3260"
+$as_echo "$at_srcdir/ofproto.at:3301: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3301"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3260"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -100266,14 +100750,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3260: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3301: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3260"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3301"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -100281,12 +100765,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3260"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -100295,15 +100779,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3260: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3260"
+$as_echo "$at_srcdir/ofproto.at:3301: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3301"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3260"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -100323,10 +100807,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3273: ofctl_strip < monitor.log"
-at_fn_check_prepare_trace "ofproto.at:3273"
+$as_echo "$at_srcdir/ofproto.at:3314: ofctl_strip < monitor.log"
+at_fn_check_prepare_trace "ofproto.at:3314"
 ( $at_check_trace; ofctl_strip < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -100343,7 +100827,7 @@
 OFPT_BARRIER_REPLY (OF1.4):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3273"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3314"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100352,15 +100836,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3287: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3287"
+$as_echo "$at_srcdir/ofproto.at:3328: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3328"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3287"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3328"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100368,15 +100852,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3287: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3287"
+$as_echo "$at_srcdir/ofproto.at:3328: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3328"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3287"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3328"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100384,15 +100868,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3287: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3287"
+$as_echo "$at_srcdir/ofproto.at:3328: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3328"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3287"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3328"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100403,13 +100887,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_770
-#AT_START_771
-at_fn_group_banner 771 'ofproto.at:3290' \
+#AT_STOP_772
+#AT_START_773
+at_fn_group_banner 773 'ofproto.at:3331' \
   "ofproto - bundle close without open (OpenFlow 1.4)" "" 49
 at_xfail=no
 (
-  $as_echo "771. $at_setup_line: testing $at_desc ..."
+  $as_echo "773. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -100420,29 +100904,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3292: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3292"
+$as_echo "$at_srcdir/ofproto.at:3333: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3333"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3292"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3333"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3292: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3292"
+$as_echo "$at_srcdir/ofproto.at:3333: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3333"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3292"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3333"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -100452,49 +100936,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3292: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3333: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3292"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3333"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3292"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3333"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3292: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3292"
+$as_echo "$at_srcdir/ofproto.at:3333: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3333"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3292"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3333"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3292: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3292"
+$as_echo "$at_srcdir/ofproto.at:3333: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3333"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3292"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3333"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -100506,14 +100990,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3292: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3333: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3292"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3333"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -100521,12 +101005,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3292"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3333"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -100535,15 +101019,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3292: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3292"
+$as_echo "$at_srcdir/ofproto.at:3333: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3333"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3292"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3333"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -100560,10 +101044,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3302: ofctl_strip < monitor.log"
-at_fn_check_prepare_trace "ofproto.at:3302"
+$as_echo "$at_srcdir/ofproto.at:3343: ofctl_strip < monitor.log"
+at_fn_check_prepare_trace "ofproto.at:3343"
 ( $at_check_trace; ofctl_strip < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -100575,7 +101059,7 @@
 OFPT_BARRIER_REPLY (OF1.4):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3302"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3343"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100584,15 +101068,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3311: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3311"
+$as_echo "$at_srcdir/ofproto.at:3352: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3352"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3311"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3352"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100600,15 +101084,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3311: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3311"
+$as_echo "$at_srcdir/ofproto.at:3352: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3352"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3311"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3352"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100616,15 +101100,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3311: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3311"
+$as_echo "$at_srcdir/ofproto.at:3352: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3352"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3311"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3352"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100635,13 +101119,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_771
-#AT_START_772
-at_fn_group_banner 772 'ofproto.at:3314' \
+#AT_STOP_773
+#AT_START_774
+at_fn_group_banner 774 'ofproto.at:3355' \
   "ofproto - bundle double close (OpenFlow 1.4)" "   " 49
 at_xfail=no
 (
-  $as_echo "772. $at_setup_line: testing $at_desc ..."
+  $as_echo "774. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -100652,29 +101136,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3316: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3316"
+$as_echo "$at_srcdir/ofproto.at:3357: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3357"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3316"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3357"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3316: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3316"
+$as_echo "$at_srcdir/ofproto.at:3357: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3357"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3316"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3357"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -100684,49 +101168,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3316: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3357: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3316"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3357"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3316"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3357"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3316: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3316"
+$as_echo "$at_srcdir/ofproto.at:3357: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3357"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3316"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3357"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3316: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3316"
+$as_echo "$at_srcdir/ofproto.at:3357: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3357"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3316"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3357"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -100738,14 +101222,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3316: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3357: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3316"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3357"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -100753,12 +101237,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3316"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3357"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -100767,15 +101251,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3316: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3316"
+$as_echo "$at_srcdir/ofproto.at:3357: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3357"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3316"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3357"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -100797,10 +101281,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3331: ofctl_strip < monitor.log"
-at_fn_check_prepare_trace "ofproto.at:3331"
+$as_echo "$at_srcdir/ofproto.at:3372: ofctl_strip < monitor.log"
+at_fn_check_prepare_trace "ofproto.at:3372"
 ( $at_check_trace; ofctl_strip < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -100822,7 +101306,7 @@
 OFPT_BARRIER_REPLY (OF1.4):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3331"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3372"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100831,15 +101315,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3350: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3350"
+$as_echo "$at_srcdir/ofproto.at:3391: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3391"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3350"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3391"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100847,15 +101331,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3350: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3350"
+$as_echo "$at_srcdir/ofproto.at:3391: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3391"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3350"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3391"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100863,15 +101347,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3350: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3350"
+$as_echo "$at_srcdir/ofproto.at:3391: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3391"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3350"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3391"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -100882,13 +101366,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_772
-#AT_START_773
-at_fn_group_banner 773 'ofproto.at:3353' \
+#AT_STOP_774
+#AT_START_775
+at_fn_group_banner 775 'ofproto.at:3394' \
   "ofproto - bundle close, different flags (OpenFlow 1.4)" "" 49
 at_xfail=no
 (
-  $as_echo "773. $at_setup_line: testing $at_desc ..."
+  $as_echo "775. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -100899,29 +101383,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3355: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3355"
+$as_echo "$at_srcdir/ofproto.at:3396: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3396"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3355"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3396"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3355: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3355"
+$as_echo "$at_srcdir/ofproto.at:3396: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3396"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3355"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3396"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -100931,49 +101415,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3355: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3396: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3355"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3396"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3355"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3396"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3355: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3355"
+$as_echo "$at_srcdir/ofproto.at:3396: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3396"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3355"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3396"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3355: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3355"
+$as_echo "$at_srcdir/ofproto.at:3396: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3396"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3355"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3396"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -100985,14 +101469,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3355: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3396: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3355"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3396"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -101000,12 +101484,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3355"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3396"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -101014,15 +101498,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3355: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3355"
+$as_echo "$at_srcdir/ofproto.at:3396: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3396"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3355"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3396"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -101042,10 +101526,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3368: ofctl_strip < monitor.log"
-at_fn_check_prepare_trace "ofproto.at:3368"
+$as_echo "$at_srcdir/ofproto.at:3409: ofctl_strip < monitor.log"
+at_fn_check_prepare_trace "ofproto.at:3409"
 ( $at_check_trace; ofctl_strip < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -101062,7 +101546,7 @@
 OFPT_BARRIER_REPLY (OF1.4):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3368"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3409"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101071,15 +101555,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3382: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3382"
+$as_echo "$at_srcdir/ofproto.at:3423: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3423"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3382"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3423"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101087,15 +101571,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3382: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3382"
+$as_echo "$at_srcdir/ofproto.at:3423: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3423"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3382"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3423"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101103,15 +101587,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3382: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3382"
+$as_echo "$at_srcdir/ofproto.at:3423: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3423"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3382"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3423"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101122,13 +101606,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_773
-#AT_START_774
-at_fn_group_banner 774 'ofproto.at:3385' \
+#AT_STOP_775
+#AT_START_776
+at_fn_group_banner 776 'ofproto.at:3426' \
   "ofproto - bundle commit without open (OpenFlow 1.4)" "" 49
 at_xfail=no
 (
-  $as_echo "774. $at_setup_line: testing $at_desc ..."
+  $as_echo "776. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -101139,29 +101623,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3387: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3387"
+$as_echo "$at_srcdir/ofproto.at:3428: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3428"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3428"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3387: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3387"
+$as_echo "$at_srcdir/ofproto.at:3428: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3428"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3428"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -101171,49 +101655,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3387: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3428: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3387"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3428"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3428"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3387: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3387"
+$as_echo "$at_srcdir/ofproto.at:3428: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3428"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3428"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3387: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3387"
+$as_echo "$at_srcdir/ofproto.at:3428: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3428"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3428"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -101225,14 +101709,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3387: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3428: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3387"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3428"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -101240,12 +101724,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3428"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -101254,15 +101738,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3387: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3387"
+$as_echo "$at_srcdir/ofproto.at:3428: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3428"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3428"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -101280,10 +101764,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3398: ofctl_strip < monitor.log"
-at_fn_check_prepare_trace "ofproto.at:3398"
+$as_echo "$at_srcdir/ofproto.at:3439: ofctl_strip < monitor.log"
+at_fn_check_prepare_trace "ofproto.at:3439"
 ( $at_check_trace; ofctl_strip < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -101295,7 +101779,7 @@
 OFPT_BARRIER_REPLY (OF1.4):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3398"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3439"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101304,15 +101788,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3407: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3407"
+$as_echo "$at_srcdir/ofproto.at:3448: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3448"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3448"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101320,15 +101804,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3407: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3407"
+$as_echo "$at_srcdir/ofproto.at:3448: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3448"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3448"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101336,15 +101820,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3407: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3407"
+$as_echo "$at_srcdir/ofproto.at:3448: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3448"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3448"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101355,13 +101839,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_774
-#AT_START_775
-at_fn_group_banner 775 'ofproto.at:3410' \
+#AT_STOP_776
+#AT_START_777
+at_fn_group_banner 777 'ofproto.at:3451' \
   "ofproto - bundle commit, different flags (OpenFlow 1.4)" "" 49
 at_xfail=no
 (
-  $as_echo "775. $at_setup_line: testing $at_desc ..."
+  $as_echo "777. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -101372,29 +101856,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3412: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3412"
+$as_echo "$at_srcdir/ofproto.at:3453: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3453"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3412"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3453"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3412: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3412"
+$as_echo "$at_srcdir/ofproto.at:3453: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3453"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3412"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3453"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -101404,49 +101888,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3412: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3453: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3412"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3453"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3412"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3453"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3412: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3412"
+$as_echo "$at_srcdir/ofproto.at:3453: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3453"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3412"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3453"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3412: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3412"
+$as_echo "$at_srcdir/ofproto.at:3453: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3453"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3412"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3453"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -101458,14 +101942,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3412: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3453: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3412"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3453"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -101473,12 +101957,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3412"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3453"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -101487,15 +101971,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3412: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3412"
+$as_echo "$at_srcdir/ofproto.at:3453: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3453"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3412"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3453"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -101515,10 +101999,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3425: ofctl_strip < monitor.log"
-at_fn_check_prepare_trace "ofproto.at:3425"
+$as_echo "$at_srcdir/ofproto.at:3466: ofctl_strip < monitor.log"
+at_fn_check_prepare_trace "ofproto.at:3466"
 ( $at_check_trace; ofctl_strip < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -101535,7 +102019,7 @@
 OFPT_BARRIER_REPLY (OF1.4):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3425"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3466"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101544,15 +102028,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3439: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3439"
+$as_echo "$at_srcdir/ofproto.at:3480: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3480"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3439"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3480"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101560,15 +102044,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3439: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3439"
+$as_echo "$at_srcdir/ofproto.at:3480: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3480"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3439"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3480"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101576,15 +102060,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3439: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3439"
+$as_echo "$at_srcdir/ofproto.at:3480: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3480"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3439"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3480"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101595,13 +102079,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_775
-#AT_START_776
-at_fn_group_banner 776 'ofproto.at:3442' \
+#AT_STOP_777
+#AT_START_778
+at_fn_group_banner 778 'ofproto.at:3483' \
   "ofproto - bundle discard without open (OpenFlow 1.4)" "" 49
 at_xfail=no
 (
-  $as_echo "776. $at_setup_line: testing $at_desc ..."
+  $as_echo "778. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -101612,29 +102096,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3444: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3444"
+$as_echo "$at_srcdir/ofproto.at:3485: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3485"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3444"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3485"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3444: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3444"
+$as_echo "$at_srcdir/ofproto.at:3485: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3485"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3444"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3485"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -101644,49 +102128,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3444: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3485: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3444"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3485"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3444"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3485"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3444: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3444"
+$as_echo "$at_srcdir/ofproto.at:3485: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3485"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3444"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3485"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3444: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3444"
+$as_echo "$at_srcdir/ofproto.at:3485: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3485"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3444"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3485"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -101698,14 +102182,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3444: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3485: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3444"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3485"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -101713,12 +102197,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3444"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3485"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -101727,15 +102211,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3444: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3444"
+$as_echo "$at_srcdir/ofproto.at:3485: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3485"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3444"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3485"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -101753,10 +102237,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3455: ofctl_strip < monitor.log"
-at_fn_check_prepare_trace "ofproto.at:3455"
+$as_echo "$at_srcdir/ofproto.at:3496: ofctl_strip < monitor.log"
+at_fn_check_prepare_trace "ofproto.at:3496"
 ( $at_check_trace; ofctl_strip < monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -101768,7 +102252,7 @@
 OFPT_BARRIER_REPLY (OF1.4):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3496"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101777,15 +102261,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3464: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3464"
+$as_echo "$at_srcdir/ofproto.at:3505: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3505"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3464"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3505"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101793,15 +102277,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3464: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3464"
+$as_echo "$at_srcdir/ofproto.at:3505: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3505"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3464"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3505"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101809,15 +102293,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3464: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3464"
+$as_echo "$at_srcdir/ofproto.at:3505: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3505"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3464"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3505"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -101828,13 +102312,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_776
-#AT_START_777
-at_fn_group_banner 777 'ofproto.at:3468' \
+#AT_STOP_778
+#AT_START_779
+at_fn_group_banner 779 'ofproto.at:3509' \
   "ofproto - bundle with multiple flow mods (OpenFlow 1.4)" "" 49
 at_xfail=no
 (
-  $as_echo "777. $at_setup_line: testing $at_desc ..."
+  $as_echo "779. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -101845,29 +102329,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3470: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3470"
+$as_echo "$at_srcdir/ofproto.at:3511: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3511"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3470"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3511"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3470: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3470"
+$as_echo "$at_srcdir/ofproto.at:3511: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3511"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3470"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3511"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -101877,49 +102361,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3470: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3511: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3470"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3511"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3470"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3511"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3470: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3470"
+$as_echo "$at_srcdir/ofproto.at:3511: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3511"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3470"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3511"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3470: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3470"
+$as_echo "$at_srcdir/ofproto.at:3511: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3511"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3470"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3511"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -101931,14 +102415,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3470: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3511: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3470"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3511"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -101946,12 +102430,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3470"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3511"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -101960,15 +102444,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3470: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3470"
+$as_echo "$at_srcdir/ofproto.at:3511: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3511"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3470"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3511"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -101977,15 +102461,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3472: ovs-appctl vlog/set vconn:dbg"
-at_fn_check_prepare_trace "ofproto.at:3472"
+$as_echo "$at_srcdir/ofproto.at:3513: ovs-appctl vlog/set vconn:dbg"
+at_fn_check_prepare_trace "ofproto.at:3513"
 ( $at_check_trace; ovs-appctl vlog/set vconn:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3472"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3513"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -101993,15 +102477,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3474: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "ofproto.at:3474"
+$as_echo "$at_srcdir/ofproto.at:3515: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "ofproto.at:3515"
 ( $at_check_trace; ovs-ofctl del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3474"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3515"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102022,15 +102506,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3488: ovs-ofctl --bundle add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto.at:3488"
+$as_echo "$at_srcdir/ofproto.at:3529: ovs-ofctl --bundle add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto.at:3529"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3488"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3529"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102038,10 +102522,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3490: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3490"
+$as_echo "$at_srcdir/ofproto.at:3531: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3531"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102050,7 +102534,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3490"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3531"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102064,15 +102548,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3501: ovs-ofctl --bundle add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto.at:3501"
+$as_echo "$at_srcdir/ofproto.at:3542: ovs-ofctl --bundle add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto.at:3542"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3501"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3542"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102080,10 +102564,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3503: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3503"
+$as_echo "$at_srcdir/ofproto.at:3544: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3544"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102092,7 +102576,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3503"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3544"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102108,15 +102592,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3516: ovs-ofctl --bundle add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto.at:3516"
+$as_echo "$at_srcdir/ofproto.at:3557: ovs-ofctl --bundle add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto.at:3557"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3516"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3557"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102124,10 +102608,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3518: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3518"
+$as_echo "$at_srcdir/ofproto.at:3559: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3559"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102136,7 +102620,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3518"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3559"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102145,29 +102629,29 @@
 
 # Prevent race.
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3526: ovs_wait_cond () { cat ovs-vswitchd.log | vconn_windows_sub | test \`grep -- \"|vconn|DBG|unix: sent (Success): NXST_FLOW reply\" | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto.at:3567: ovs_wait_cond () { cat ovs-vswitchd.log | vconn_windows_sub | test \`grep -- \"|vconn|DBG|unix: sent (Success): NXST_FLOW reply\" | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto.at:3526"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto.at:3567"
 ( $at_check_trace; ovs_wait_cond () { cat ovs-vswitchd.log | vconn_windows_sub | test `grep -- "|vconn|DBG|unix: sent (Success): NXST_FLOW reply" | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3526"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3567"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3527: print_vconn_debug | vconn_windows_sub | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3527"
+$as_echo "$at_srcdir/ofproto.at:3568: print_vconn_debug | vconn_windows_sub | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3568"
 ( $at_check_trace; print_vconn_debug | vconn_windows_sub | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102298,7 +102782,7 @@
  in_port=2,dl_src=00:66:77:88:99:aa actions=drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3527"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3568"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102306,45 +102790,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3655: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3655"
+$as_echo "$at_srcdir/ofproto.at:3696: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3696"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3655"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3696"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3655: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3655"
+$as_echo "$at_srcdir/ofproto.at:3696: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3696"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3655"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3696"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3655: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3655"
+$as_echo "$at_srcdir/ofproto.at:3696: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3696"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3655"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3696"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102354,13 +102838,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_777
-#AT_START_778
-at_fn_group_banner 778 'ofproto.at:3659' \
+#AT_STOP_779
+#AT_START_780
+at_fn_group_banner 780 'ofproto.at:3700' \
   "ofproto - failing bundle commit (OpenFlow 1.4)" " " 49
 at_xfail=no
 (
-  $as_echo "778. $at_setup_line: testing $at_desc ..."
+  $as_echo "780. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -102371,29 +102855,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3661: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3661"
+$as_echo "$at_srcdir/ofproto.at:3702: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto.at:3702"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3702"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3661: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3661"
+$as_echo "$at_srcdir/ofproto.at:3702: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto.at:3702"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3702"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -102403,49 +102887,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3661: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3702: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3661"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3702"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3702"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3661: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto.at:3661"
+$as_echo "$at_srcdir/ofproto.at:3702: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto.at:3702"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3702"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3661: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto.at:3661"
+$as_echo "$at_srcdir/ofproto.at:3702: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto.at:3702"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3702"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -102457,14 +102941,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3661: sed < stderr '
+$as_echo "$at_srcdir/ofproto.at:3702: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3661"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3702"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -102472,12 +102956,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3702"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102486,15 +102970,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto.at:3661: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto.at:3661"
+$as_echo "$at_srcdir/ofproto.at:3702: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto.at:3702"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3702"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102503,15 +102987,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3663: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "ofproto.at:3663"
+$as_echo "$at_srcdir/ofproto.at:3704: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "ofproto.at:3704"
 ( $at_check_trace; ovs-ofctl del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3663"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3704"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102524,10 +103008,10 @@
 idle_timeout=70 in_port=2 dl_src=00:88:99:aa:bb:cc actions=33
 EOF
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3670: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3670"
+$as_echo "$at_srcdir/ofproto.at:3711: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3711"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102537,7 +103021,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3670"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3711"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102560,12 +103044,12 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3691: ovs-ofctl --bundle add-flows br0 flows.txt 2>&1 | sed '/|WARN|/d
+$as_echo "$at_srcdir/ofproto.at:3732: ovs-ofctl --bundle add-flows br0 flows.txt 2>&1 | sed '/|WARN|/d
 s/unix:.*br0\\.mgmt/unix:br0.mgmt/' | sed 's/(.* error)/(error)/'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3691"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto.at:3732"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows.txt 2>&1 | sed '/|WARN|/d
 s/unix:.*br0\.mgmt/unix:br0.mgmt/' | sed 's/(.* error)/(error)/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102577,7 +103061,7 @@
 ovs-ofctl: talking to unix:br0.mgmt (error)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3732"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102585,10 +103069,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3702: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3702"
+$as_echo "$at_srcdir/ofproto.at:3743: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto.at:3743"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102598,7 +103082,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3702"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3743"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102606,45 +103090,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto.at:3709: check_logs "
-at_fn_check_prepare_trace "ofproto.at:3709"
+$as_echo "$at_srcdir/ofproto.at:3750: check_logs "
+at_fn_check_prepare_trace "ofproto.at:3750"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3709"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3750"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3709: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto.at:3709"
+$as_echo "$at_srcdir/ofproto.at:3750: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto.at:3750"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3709"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3750"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto.at:3709: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto.at:3709"
+$as_echo "$at_srcdir/ofproto.at:3750: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto.at:3750"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3709"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto.at:3750"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -102654,13 +103138,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_778
-#AT_START_779
-at_fn_group_banner 779 'dpif-netdev.at:23' \
+#AT_STOP_780
+#AT_START_781
+at_fn_group_banner 781 'dpif-netdev.at:23' \
   "dpif-netdev - dummy interface" "                  " 50
 at_xfail=no
 (
-  $as_echo "779. $at_setup_line: testing $at_desc ..."
+  $as_echo "781. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # Create br0 with interfaces p1 and p7
@@ -102676,7 +103160,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:27: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "dpif-netdev.at:27"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102690,7 +103174,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:27: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "dpif-netdev.at:27"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -102712,7 +103196,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102727,7 +103211,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:27: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "dpif-netdev.at:27"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102742,7 +103226,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:27: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "dpif-netdev.at:27"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -102774,7 +103258,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102805,7 +103289,7 @@
                   fail-mode=secure -- \
    add-port br1 p2 -- set interface p2 type=dummy options:stream=unix:$OVS_RUNDIR/p0.sock ofport_request=2 -- \
    add-port br1 p8 -- set interface p8 ofport_request=8 type=dummy --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102821,7 +103305,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:36: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
 at_fn_check_prepare_trace "dpif-netdev.at:36"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102837,7 +103321,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:38: ovs-ofctl add-flow br0 action=normal"
 at_fn_check_prepare_trace "dpif-netdev.at:38"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102852,7 +103336,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:39: ovs-ofctl add-flow br1 action=normal"
 at_fn_check_prepare_trace "dpif-netdev.at:39"
 ( $at_check_trace; ovs-ofctl add-flow br1 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102869,7 +103353,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:42: ovs-appctl netdev-dummy/receive p7 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "dpif-netdev.at:42"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p7 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102884,7 +103368,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:43: ovs-appctl netdev-dummy/receive p8 'in_port(8),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "dpif-netdev.at:43"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p8 'in_port(8),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102920,7 +103404,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102941,7 +103425,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:54: check_logs "
 at_fn_check_prepare_trace "dpif-netdev.at:54"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102956,7 +103440,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:54: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "dpif-netdev.at:54"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102971,7 +103455,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:54: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "dpif-netdev.at:54"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -102986,13 +103470,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_779
-#AT_START_780
-at_fn_group_banner 780 'dpif-netdev.at:57' \
+#AT_STOP_781
+#AT_START_782
+at_fn_group_banner 782 'dpif-netdev.at:57' \
   "dpif-netdev - miss upcall key matches flow_install" "" 50
 at_xfail=no
 (
-  $as_echo "780. $at_setup_line: testing $at_desc ..."
+  $as_echo "782. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -103005,7 +103489,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:58: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "dpif-netdev.at:58"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103019,7 +103503,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:58: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "dpif-netdev.at:58"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -103041,7 +103525,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103056,7 +103540,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:58: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "dpif-netdev.at:58"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103071,7 +103555,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:58: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "dpif-netdev.at:58"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -103103,7 +103587,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103124,7 +103608,7 @@
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set interface p1 type=dummy options:pstream=punix:$OVS_RUNDIR/p0.sock
    set bridge br0 datapath-type=dummy other-config:datapath-id=1234 \
                   fail-mode=secure
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103140,7 +103624,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:62: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
 at_fn_check_prepare_trace "dpif-netdev.at:62"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103156,7 +103640,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:64: ovs-ofctl add-flow br0 action=normal"
 at_fn_check_prepare_trace "dpif-netdev.at:64"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103171,7 +103655,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:65: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "dpif-netdev.at:65"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103188,7 +103672,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:68: cat ovs-vswitchd.log | grep -A 1 'miss upcall' | tail -n 1"
 at_fn_check_prepare_notrace 'a shell pipeline' "dpif-netdev.at:68"
 ( $at_check_trace; cat ovs-vswitchd.log | grep -A 1 'miss upcall' | tail -n 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103223,7 +103707,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103242,7 +103726,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:76: ovs-appctl upcall/disable-megaflows"
 at_fn_check_prepare_trace "dpif-netdev.at:76"
 ( $at_check_trace; ovs-appctl upcall/disable-megaflows
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103259,7 +103743,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:78: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "dpif-netdev.at:78"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103276,7 +103760,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:81: cat ovs-vswitchd.log | grep -A 1 'miss upcall' | tail -n 1"
 at_fn_check_prepare_notrace 'a shell pipeline' "dpif-netdev.at:81"
 ( $at_check_trace; cat ovs-vswitchd.log | grep -A 1 'miss upcall' | tail -n 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103311,7 +103795,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103330,7 +103814,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:89: check_logs "
 at_fn_check_prepare_trace "dpif-netdev.at:89"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103345,7 +103829,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:89: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "dpif-netdev.at:89"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103360,7 +103844,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:89: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "dpif-netdev.at:89"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103375,13 +103859,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_780
-#AT_START_781
-at_fn_group_banner 781 'dpif-netdev.at:92' \
+#AT_STOP_782
+#AT_START_783
+at_fn_group_banner 783 'dpif-netdev.at:92' \
   "dpif-netdev - miss upcall key matches flow_dump" "" 50
 at_xfail=no
 (
-  $as_echo "781. $at_setup_line: testing $at_desc ..."
+  $as_echo "783. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -103394,7 +103878,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:93: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "dpif-netdev.at:93"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103408,7 +103892,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:93: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "dpif-netdev.at:93"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -103430,7 +103914,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103445,7 +103929,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:93: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "dpif-netdev.at:93"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103460,7 +103944,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:93: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "dpif-netdev.at:93"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -103492,7 +103976,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103513,7 +103997,7 @@
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set interface p1 type=dummy options:pstream=punix:$OVS_RUNDIR/p0.sock
    set bridge br0 datapath-type=dummy other-config:datapath-id=1234 \
                   fail-mode=secure
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103529,7 +104013,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:97: ovs-appctl upcall/disable-ufid"
 at_fn_check_prepare_trace "dpif-netdev.at:97"
 ( $at_check_trace; ovs-appctl upcall/disable-ufid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103546,7 +104030,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:99: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
 at_fn_check_prepare_trace "dpif-netdev.at:99"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103562,7 +104046,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:101: ovs-ofctl add-flow br0 action=normal"
 at_fn_check_prepare_trace "dpif-netdev.at:101"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103577,7 +104061,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:102: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "dpif-netdev.at:102"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103594,7 +104078,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:105: cat ovs-vswitchd.log | grep -A 1 'miss upcall' | tail -n 1"
 at_fn_check_prepare_notrace 'a shell pipeline' "dpif-netdev.at:105"
 ( $at_check_trace; cat ovs-vswitchd.log | grep -A 1 'miss upcall' | tail -n 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103631,7 +104115,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103650,7 +104134,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:113: ovs-appctl upcall/disable-megaflows"
 at_fn_check_prepare_trace "dpif-netdev.at:113"
 ( $at_check_trace; ovs-appctl upcall/disable-megaflows
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103667,7 +104151,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:115: ovs-appctl upcall/disable-ufid"
 at_fn_check_prepare_trace "dpif-netdev.at:115"
 ( $at_check_trace; ovs-appctl upcall/disable-ufid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103684,7 +104168,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:117: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "dpif-netdev.at:117"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103701,7 +104185,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:120: cat ovs-vswitchd.log | grep -A 1 'miss upcall' | tail -n 1"
 at_fn_check_prepare_notrace 'a shell pipeline' "dpif-netdev.at:120"
 ( $at_check_trace; cat ovs-vswitchd.log | grep -A 1 'miss upcall' | tail -n 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103738,7 +104222,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103757,7 +104241,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:128: check_logs "
 at_fn_check_prepare_trace "dpif-netdev.at:128"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103772,7 +104256,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:128: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "dpif-netdev.at:128"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103787,7 +104271,7 @@
 $as_echo "$at_srcdir/dpif-netdev.at:128: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "dpif-netdev.at:128"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103802,13 +104286,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_781
-#AT_START_782
-at_fn_group_banner 782 'dpctl.at:3' \
+#AT_STOP_783
+#AT_START_784
+at_fn_group_banner 784 'dpctl.at:3' \
   "dpctl - add-dp del-dp" "                          " 51
 at_xfail=no
 (
-  $as_echo "782. $at_setup_line: testing $at_desc ..."
+  $as_echo "784. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -103821,7 +104305,7 @@
 $as_echo "$at_srcdir/dpctl.at:4: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "dpctl.at:4"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103835,7 +104319,7 @@
 $as_echo "$at_srcdir/dpctl.at:4: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "dpctl.at:4"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -103857,7 +104341,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103872,7 +104356,7 @@
 $as_echo "$at_srcdir/dpctl.at:4: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "dpctl.at:4"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103887,7 +104371,7 @@
 $as_echo "$at_srcdir/dpctl.at:4: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "dpctl.at:4"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -103919,7 +104403,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103936,7 +104420,7 @@
 $as_echo "$at_srcdir/dpctl.at:4: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "dpctl.at:4"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103952,7 +104436,7 @@
 $as_echo "$at_srcdir/dpctl.at:5: ovs-appctl dpctl/add-dp dummy@br0"
 at_fn_check_prepare_trace "dpctl.at:5"
 ( $at_check_trace; ovs-appctl dpctl/add-dp dummy@br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -103967,7 +104451,7 @@
 $as_echo "$at_srcdir/dpctl.at:6: ovs-appctl dpctl/add-dp dummy@br0"
 at_fn_check_prepare_trace "dpctl.at:6"
 ( $at_check_trace; ovs-appctl dpctl/add-dp dummy@br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vswitchd: add_dp (File exists)
@@ -103985,7 +104469,7 @@
 $as_echo "$at_srcdir/dpctl.at:10: ovs-appctl dpctl/del-dp dummy@br0"
 at_fn_check_prepare_trace "dpctl.at:10"
 ( $at_check_trace; ovs-appctl dpctl/del-dp dummy@br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104000,7 +104484,7 @@
 $as_echo "$at_srcdir/dpctl.at:11: ovs-appctl dpctl/del-dp dummy@br0"
 at_fn_check_prepare_trace "dpctl.at:11"
 ( $at_check_trace; ovs-appctl dpctl/del-dp dummy@br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -104015,7 +104499,7 @@
 $as_echo "$at_srcdir/dpctl.at:12: sed 's/(.*)/(...)/' stderr"
 at_fn_check_prepare_trace "dpctl.at:12"
 ( $at_check_trace; sed 's/(.*)/(...)/' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104033,7 +104517,7 @@
 $as_echo "$at_srcdir/dpctl.at:16: check_logs "
 at_fn_check_prepare_trace "dpctl.at:16"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104048,7 +104532,7 @@
 $as_echo "$at_srcdir/dpctl.at:16: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "dpctl.at:16"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104063,7 +104547,7 @@
 $as_echo "$at_srcdir/dpctl.at:16: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "dpctl.at:16"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104078,13 +104562,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_782
-#AT_START_783
-at_fn_group_banner 783 'dpctl.at:19' \
+#AT_STOP_784
+#AT_START_785
+at_fn_group_banner 785 'dpctl.at:19' \
   "dpctl - add-if set-if del-if" "                   " 51
 at_xfail=no
 (
-  $as_echo "783. $at_setup_line: testing $at_desc ..."
+  $as_echo "785. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -104097,7 +104581,7 @@
 $as_echo "$at_srcdir/dpctl.at:20: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "dpctl.at:20"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104111,7 +104595,7 @@
 $as_echo "$at_srcdir/dpctl.at:20: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "dpctl.at:20"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -104133,7 +104617,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104148,7 +104632,7 @@
 $as_echo "$at_srcdir/dpctl.at:20: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "dpctl.at:20"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104163,7 +104647,7 @@
 $as_echo "$at_srcdir/dpctl.at:20: ovs-vswitchd --enable-dummy=override --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "dpctl.at:20"
 ( $at_check_trace; ovs-vswitchd --enable-dummy=override --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -104195,7 +104679,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104212,7 +104696,7 @@
 $as_echo "$at_srcdir/dpctl.at:20: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "dpctl.at:20"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104228,7 +104712,7 @@
 $as_echo "$at_srcdir/dpctl.at:21: ovs-appctl dpctl/add-dp dummy@br0"
 at_fn_check_prepare_trace "dpctl.at:21"
 ( $at_check_trace; ovs-appctl dpctl/add-dp dummy@br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104243,7 +104727,7 @@
 $as_echo "$at_srcdir/dpctl.at:22: ovs-appctl dpctl/show dummy@br0"
 at_fn_check_prepare_trace "dpctl.at:22"
 ( $at_check_trace; ovs-appctl dpctl/show dummy@br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104263,7 +104747,7 @@
 $as_echo "$at_srcdir/dpctl.at:28: ovs-appctl dpctl/add-if dummy@br0 vif1.0,type=dummy,port_no=5"
 at_fn_check_prepare_trace "dpctl.at:28"
 ( $at_check_trace; ovs-appctl dpctl/add-if dummy@br0 vif1.0,type=dummy,port_no=5
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104278,7 +104762,7 @@
 $as_echo "$at_srcdir/dpctl.at:29: ovs-appctl dpctl/show dummy@br0"
 at_fn_check_prepare_trace "dpctl.at:29"
 ( $at_check_trace; ovs-appctl dpctl/show dummy@br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104299,7 +104783,7 @@
 $as_echo "$at_srcdir/dpctl.at:36: ovs-appctl dpctl/add-if dummy@br0 vif1.0,type=dummy"
 at_fn_check_prepare_trace "dpctl.at:36"
 ( $at_check_trace; ovs-appctl dpctl/add-if dummy@br0 vif1.0,type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -104314,7 +104798,7 @@
 $as_echo "$at_srcdir/dpctl.at:38: sed 's/(.*)/(...)/' stderr"
 at_fn_check_prepare_trace "dpctl.at:38"
 ( $at_check_trace; sed 's/(.*)/(...)/' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104332,7 +104816,7 @@
 $as_echo "$at_srcdir/dpctl.at:42: ovs-appctl dpctl/set-if dummy@br0 vif1.0,port_no=5"
 at_fn_check_prepare_trace "dpctl.at:42"
 ( $at_check_trace; ovs-appctl dpctl/set-if dummy@br0 vif1.0,port_no=5
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104347,7 +104831,7 @@
 $as_echo "$at_srcdir/dpctl.at:43: ovs-appctl dpctl/set-if dummy@br0 vif1.0,type=system"
 at_fn_check_prepare_trace "dpctl.at:43"
 ( $at_check_trace; ovs-appctl dpctl/set-if dummy@br0 vif1.0,type=system
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vswitchd: vif1.0: can't change type from dummy to system
@@ -104365,7 +104849,7 @@
 $as_echo "$at_srcdir/dpctl.at:47: ovs-appctl dpctl/set-if dummy@br0 br0,type=dummy"
 at_fn_check_prepare_trace "dpctl.at:47"
 ( $at_check_trace; ovs-appctl dpctl/set-if dummy@br0 br0,type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vswitchd: br0: can't change type from internal to dummy
@@ -104383,7 +104867,7 @@
 $as_echo "$at_srcdir/dpctl.at:51: ovs-appctl dpctl/del-if dummy@br0 vif1.0"
 at_fn_check_prepare_trace "dpctl.at:51"
 ( $at_check_trace; ovs-appctl dpctl/del-if dummy@br0 vif1.0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104398,7 +104882,7 @@
 $as_echo "$at_srcdir/dpctl.at:52: ovs-appctl dpctl/show dummy@br0"
 at_fn_check_prepare_trace "dpctl.at:52"
 ( $at_check_trace; ovs-appctl dpctl/show dummy@br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104418,7 +104902,7 @@
 $as_echo "$at_srcdir/dpctl.at:58: ovs-appctl dpctl/del-if dummy@br0 vif1.0"
 at_fn_check_prepare_trace "dpctl.at:58"
 ( $at_check_trace; ovs-appctl dpctl/del-if dummy@br0 vif1.0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vswitchd: no port named vif1.0
@@ -104436,7 +104920,7 @@
 $as_echo "$at_srcdir/dpctl.at:62: ovs-appctl dpctl/show dummy@br0"
 at_fn_check_prepare_trace "dpctl.at:62"
 ( $at_check_trace; ovs-appctl dpctl/show dummy@br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104456,7 +104940,7 @@
 $as_echo "$at_srcdir/dpctl.at:68: ovs-appctl dpctl/del-if dummy@br0 nonexistent"
 at_fn_check_prepare_trace "dpctl.at:68"
 ( $at_check_trace; ovs-appctl dpctl/del-if dummy@br0 nonexistent
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vswitchd: no port named nonexistent
@@ -104474,7 +104958,7 @@
 $as_echo "$at_srcdir/dpctl.at:72: ovs-appctl dpctl/del-if dummy@br0 br0"
 at_fn_check_prepare_trace "dpctl.at:72"
 ( $at_check_trace; ovs-appctl dpctl/del-if dummy@br0 br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -104489,7 +104973,7 @@
 $as_echo "$at_srcdir/dpctl.at:73: sed 's/(.*)/(...)/' stderr"
 at_fn_check_prepare_trace "dpctl.at:73"
 ( $at_check_trace; sed 's/(.*)/(...)/' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104507,7 +104991,7 @@
 $as_echo "$at_srcdir/dpctl.at:77: ovs-appctl dpctl/del-dp dummy@br0"
 at_fn_check_prepare_trace "dpctl.at:77"
 ( $at_check_trace; ovs-appctl dpctl/del-dp dummy@br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104522,7 +105006,7 @@
 $as_echo "$at_srcdir/dpctl.at:78: ovs-appctl dpctl/del-if dummy@br0 br0"
 at_fn_check_prepare_trace "dpctl.at:78"
 ( $at_check_trace; ovs-appctl dpctl/del-if dummy@br0 br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -104537,7 +105021,7 @@
 $as_echo "$at_srcdir/dpctl.at:79: sed 's/(.*)/(...)/' stderr"
 at_fn_check_prepare_trace "dpctl.at:79"
 ( $at_check_trace; sed 's/(.*)/(...)/' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104557,7 +105041,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "dpctl.at:83"
 ( $at_check_trace; check_logs "/dummy@br0: port_del failed/d
 /dummy@br0: failed to add vif1.0 as port/d"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104572,7 +105056,7 @@
 $as_echo "$at_srcdir/dpctl.at:83: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "dpctl.at:83"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104587,7 +105071,7 @@
 $as_echo "$at_srcdir/dpctl.at:83: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "dpctl.at:83"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104602,13 +105086,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_783
-#AT_START_784
-at_fn_group_banner 784 'ofproto-dpif.at:3' \
+#AT_STOP_785
+#AT_START_786
+at_fn_group_banner 786 'ofproto-dpif.at:3' \
   "ofproto-dpif - revalidator/wait" "                " 52
 at_xfail=no
 (
-  $as_echo "784. $at_setup_line: testing $at_desc ..."
+  $as_echo "786. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -104621,7 +105105,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:4: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104635,7 +105119,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:4: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -104657,7 +105141,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104672,7 +105156,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:4: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto-dpif.at:4"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104687,7 +105171,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:4: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto-dpif.at:4"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -104719,7 +105203,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104736,7 +105220,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:4: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ofproto-dpif.at:4"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104752,7 +105236,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:5: ovs-appctl revalidator/wait"
 at_fn_check_prepare_trace "ofproto-dpif.at:5"
 ( $at_check_trace; ovs-appctl revalidator/wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104767,7 +105251,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:6: check_logs "
 at_fn_check_prepare_trace "ofproto-dpif.at:6"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104782,7 +105266,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:6: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto-dpif.at:6"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104797,7 +105281,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:6: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto-dpif.at:6"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104812,13 +105296,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_784
-#AT_START_785
-at_fn_group_banner 785 'ofproto-dpif.at:9' \
+#AT_STOP_786
+#AT_START_787
+at_fn_group_banner 787 'ofproto-dpif.at:9' \
   "ofproto-dpif - active-backup bonding" "           " 52
 at_xfail=no
 (
-  $as_echo "785. $at_setup_line: testing $at_desc ..."
+  $as_echo "787. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # Create br0 with interfaces p1, p2 and p7, creating bond0 with p1 and p2
@@ -104834,7 +105318,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:13: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:13"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104848,7 +105332,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:13: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:13"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -104870,7 +105354,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104885,7 +105369,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:13: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto-dpif.at:13"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104900,7 +105384,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:13: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto-dpif.at:13"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -104932,7 +105416,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104969,7 +105453,7 @@
    add-port br1 p3 -- set interface p3 type=dummy options:stream=unix:$OVS_RUNDIR/p1.sock ofport_request=3 -- \
    add-port br1 p4 -- set interface p4 type=dummy options:stream=unix:$OVS_RUNDIR/p2.sock ofport_request=4 -- \
    add-port br1 p8 -- set interface p8 ofport_request=8 type=dummy --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -104993,7 +105477,7 @@
                   | grep 'unknown\|disconnected'; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -105014,7 +105498,7 @@
                   | grep 'unknown\|disconnected'; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -105029,7 +105513,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:26: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
 at_fn_check_prepare_trace "ofproto-dpif.at:26"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105045,7 +105529,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:28: ovs-ofctl add-flow br0 action=normal"
 at_fn_check_prepare_trace "ofproto-dpif.at:28"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105060,7 +105544,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:29: ovs-ofctl add-flow br1 action=normal"
 at_fn_check_prepare_trace "ofproto-dpif.at:29"
 ( $at_check_trace; ovs-ofctl add-flow br1 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105080,7 +105564,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:35: ovs-appctl netdev-dummy/receive p7 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "ofproto-dpif.at:35"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p7 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105095,7 +105579,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:36: ovs-appctl netdev-dummy/receive p7 'in_port(7),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "ofproto-dpif.at:36"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p7 'in_port(7),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105114,7 +105598,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:41: ovs-appctl netdev-dummy/receive p7 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0d),eth_type(0x0800),ipv4(src=10.0.0.5,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "ofproto-dpif.at:41"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p7 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0d),eth_type(0x0800),ipv4(src=10.0.0.5,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105129,7 +105613,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:42: ovs-appctl netdev-dummy/receive p7 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0e),eth_type(0x0800),ipv4(src=10.0.0.6,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
 at_fn_check_prepare_trace "ofproto-dpif.at:42"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p7 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0e),eth_type(0x0800),ipv4(src=10.0.0.6,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105164,7 +105648,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105186,7 +105670,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:53: check_logs "
 at_fn_check_prepare_trace "ofproto-dpif.at:53"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105201,7 +105685,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:53: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto-dpif.at:53"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105216,7 +105700,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:53: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto-dpif.at:53"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105231,13 +105715,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_785
-#AT_START_786
-at_fn_group_banner 786 'ofproto-dpif.at:56' \
+#AT_STOP_787
+#AT_START_788
+at_fn_group_banner 788 'ofproto-dpif.at:56' \
   "ofproto-dpif - balance-slb bonding" "             " 52
 at_xfail=no
 (
-  $as_echo "786. $at_setup_line: testing $at_desc ..."
+  $as_echo "788. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # Create br0 with interfaces bond0(p1, p2, p3) and p7,
@@ -105254,7 +105738,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:61: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:61"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105268,7 +105752,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:61: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:61"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -105290,7 +105774,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105305,7 +105789,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:61: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto-dpif.at:61"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105320,7 +105804,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:61: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto-dpif.at:61"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -105352,7 +105836,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105393,7 +105877,7 @@
    add-port br1 p5 -- set interface p5 type=dummy options:stream=unix:$OVS_RUNDIR/p2.sock ofport_request=5 -- \
    add-port br1 p6 -- set interface p6 type=dummy options:stream=unix:$OVS_RUNDIR/p3.sock ofport_request=6 -- \
    add-port br1 p8 -- set interface p8 ofport_request=8 type=dummy --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105417,7 +105901,7 @@
                   | grep 'unknown\|disconnected'; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -105438,7 +105922,7 @@
                   | grep 'unknown\|disconnected'; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -105459,7 +105943,7 @@
                   | grep 'unknown\|disconnected'; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -105474,7 +105958,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:76: ovs-ofctl add-flow br0 action=normal"
 at_fn_check_prepare_trace "ofproto-dpif.at:76"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105489,7 +105973,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:77: ovs-ofctl add-flow br1 action=normal"
 at_fn_check_prepare_trace "ofproto-dpif.at:77"
 ( $at_check_trace; ovs-ofctl add-flow br1 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105504,7 +105988,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:78: ovs-appctl netdev-dummy/set-admin-state up"
 at_fn_check_prepare_trace "ofproto-dpif.at:78"
 ( $at_check_trace; ovs-appctl netdev-dummy/set-admin-state up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105527,7 +106011,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:86: ovs-appctl netdev-dummy/receive p7 \$pkt"
 at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p7 $pkt" "ofproto-dpif.at:86"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p7 $pkt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105545,7 +106029,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:90: ovs-appctl dpif/dump-flows br1 > br1_flows.txt"
 at_fn_check_prepare_trace "ofproto-dpif.at:90"
 ( $at_check_trace; ovs-appctl dpif/dump-flows br1 > br1_flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105562,7 +106046,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:93: test \`egrep 'in_port\\(4\\)' br1_flows.txt |wc -l\` -gt 3"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:93"
 ( $at_check_trace; test `egrep 'in_port\(4\)' br1_flows.txt |wc -l` -gt 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105577,7 +106061,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:94: test \`egrep 'in_port\\(5\\)' br1_flows.txt |wc -l\` -gt 3"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:94"
 ( $at_check_trace; test `egrep 'in_port\(5\)' br1_flows.txt |wc -l` -gt 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105592,7 +106076,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:95: test \`egrep 'in_port\\(6\\)' br1_flows.txt |wc -l\` -gt 3"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:95"
 ( $at_check_trace; test `egrep 'in_port\(6\)' br1_flows.txt |wc -l` -gt 3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105607,7 +106091,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:96: check_logs "
 at_fn_check_prepare_trace "ofproto-dpif.at:96"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105622,7 +106106,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:96: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto-dpif.at:96"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105637,7 +106121,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:96: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto-dpif.at:96"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105652,13 +106136,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_786
-#AT_START_787
-at_fn_group_banner 787 'ofproto-dpif.at:99' \
+#AT_STOP_788
+#AT_START_789
+at_fn_group_banner 789 'ofproto-dpif.at:99' \
   "ofproto-dpif - balance-tcp bonding" "             " 52
 at_xfail=no
 (
-  $as_echo "787. $at_setup_line: testing $at_desc ..."
+  $as_echo "789. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # Create br0 with interfaces bond0(p1, p2, p3) and p7,
@@ -105675,7 +106159,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:104: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:104"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105689,7 +106173,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:104: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:104"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -105711,7 +106195,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105726,7 +106210,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:104: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto-dpif.at:104"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105741,7 +106225,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:104: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto-dpif.at:104"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -105773,7 +106257,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105820,7 +106304,7 @@
    set interface p5 type=dummy options:stream=unix:$OVS_RUNDIR/p2.sock ofport_request=5 -- \
    set interface p6 type=dummy options:stream=unix:$OVS_RUNDIR/p3.sock ofport_request=6 -- \
    add-port br1 p8 -- set interface p8 ofport_request=8 type=dummy --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105836,7 +106320,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:121: ovs-appctl netdev-dummy/set-admin-state up"
 at_fn_check_prepare_trace "ofproto-dpif.at:121"
 ( $at_check_trace; ovs-appctl netdev-dummy/set-admin-state up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105853,7 +106337,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:123: ovs-ofctl add-flow br0 action=normal"
 at_fn_check_prepare_trace "ofproto-dpif.at:123"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105868,7 +106352,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:124: ovs-ofctl add-flow br1 action=normal"
 at_fn_check_prepare_trace "ofproto-dpif.at:124"
 ( $at_check_trace; ovs-ofctl add-flow br1 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105883,7 +106367,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:125: ovs-appctl upcall/disable-megaflows"
 at_fn_check_prepare_trace "ofproto-dpif.at:125"
 ( $at_check_trace; ovs-appctl upcall/disable-megaflows
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105904,7 +106388,7 @@
 ( $at_check_trace; ovs_wait_cond () { if ovs-appctl bond/show | grep "may_enable: false"; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -105927,7 +106411,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:136: ovs-appctl netdev-dummy/receive p7 \$pkt"
 at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p7 $pkt" "ofproto-dpif.at:136"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p7 $pkt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105945,7 +106429,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:140: ovs-appctl dpif/dump-flows br0 |grep tcp > br0_flows.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:140"
 ( $at_check_trace; ovs-appctl dpif/dump-flows br0 |grep tcp > br0_flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105960,7 +106444,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:141: ovs-appctl dpif/dump-flows br1 |grep tcp > br1_flows.txt"
 at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:141"
 ( $at_check_trace; ovs-appctl dpif/dump-flows br1 |grep tcp > br1_flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105977,7 +106461,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:144: test \`grep in_port.4 br1_flows.txt |wc -l\` -gt 24"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:144"
 ( $at_check_trace; test `grep in_port.4 br1_flows.txt |wc -l` -gt 24
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -105992,7 +106476,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:145: test \`grep in_port.5 br1_flows.txt |wc -l\` -gt 24"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:145"
 ( $at_check_trace; test `grep in_port.5 br1_flows.txt |wc -l` -gt 24
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106007,7 +106491,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:146: test \`grep in_port.6 br1_flows.txt |wc -l\` -gt 24"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:146"
 ( $at_check_trace; test `grep in_port.6 br1_flows.txt |wc -l` -gt 24
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106023,7 +106507,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:148: check_logs "
 at_fn_check_prepare_trace "ofproto-dpif.at:148"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106038,7 +106522,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:148: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ofproto-dpif.at:148"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106053,7 +106537,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:148: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ofproto-dpif.at:148"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106068,13 +106552,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_787
-#AT_START_788
-at_fn_group_banner 788 'ofproto-dpif.at:152' \
+#AT_STOP_789
+#AT_START_790
+at_fn_group_banner 790 'ofproto-dpif.at:152' \
   "ofproto-dpif - balance-tcp bonding, different recirc flow " "" 52
 at_xfail=no
 (
-  $as_echo "788. $at_setup_line: testing $at_desc ..."
+  $as_echo "790. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -106087,7 +106571,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:153: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:153"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106101,7 +106585,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:153: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:153"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -106123,7 +106607,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106138,7 +106622,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:153: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ofproto-dpif.at:153"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106153,7 +106637,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:153: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ofproto-dpif.at:153"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -106185,7 +106669,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106240,7 +106724,7 @@
    add-port br-int br1+ -- set interface br1+ type=patch options:peer=br1- ofport_request=101 -- \
    add-port br-int p5 -- set interface p5 ofport_request=5 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106256,7 +106740,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:174: ovs-appctl netdev-dummy/set-admin-state up"
 at_fn_check_prepare_trace "ofproto-dpif.at:174"
 ( $at_check_trace; ovs-appctl netdev-dummy/set-admin-state up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106279,7 +106763,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `ovs-appctl bond/show | grep -- "may_enable: true" |  wc -l` -ge 4
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -106302,7 +106786,7 @@
 $as_echo "$at_srcdir/ofproto-dpif.at:186: ovs-ofctl add-flows br-int flows.txt"
 at_fn_check_prepare_trace "ofproto-dpif.at:186"
 ( $at_check_trace; ovs-ofctl add-flows br-int flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106315,17 +106799,16 @@
 
 
 # Sends a packet to trigger recirculation.
-# Should generate recirc_id(0x2),dp_hash(0xc1261ba2/0xff).
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:190: ovs-appctl netdev-dummy/receive p5 \"in_port(5),eth(src=50:54:00:00:00:05,dst=50:54:00:00:01:00),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1)\""
-at_fn_check_prepare_trace "ofproto-dpif.at:190"
+$as_echo "$at_srcdir/ofproto-dpif.at:189: ovs-appctl netdev-dummy/receive p5 \"in_port(5),eth(src=50:54:00:00:00:05,dst=50:54:00:00:01:00),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1)\""
+at_fn_check_prepare_trace "ofproto-dpif.at:189"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p5 "in_port(5),eth(src=50:54:00:00:00:05,dst=50:54:00:00:01:00),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1)"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:190"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:189"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106334,15 +106817,15 @@
 
 # Collects flow stats.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:193: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:193"
+$as_echo "$at_srcdir/ofproto-dpif.at:192: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:192"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:193"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:192"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106352,17 +106835,17 @@
 # Checks the flow stats in br1, should only be one flow with non-zero
 # 'n_packets' from internal table.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:197: ovs-appctl bridge/dump-flows br1 | ofctl_strip | grep -- \"n_packets\" | grep -- \"table_id\" | sed -e 's/dp_hash=0x[0-9a-f][0-9a-f]*/dp_hash=0x0/' -e 's/output:[0-9][0-9]*/output/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:197"
-( $at_check_trace; ovs-appctl bridge/dump-flows br1 | ofctl_strip | grep -- "n_packets" | grep -- "table_id" | sed -e 's/dp_hash=0x[0-9a-f][0-9a-f]*/dp_hash=0x0/' -e 's/output:[0-9][0-9]*/output/'
-) >>"$at_stdout" 2>>"$at_stderr"
+$as_echo "$at_srcdir/ofproto-dpif.at:196: ovs-appctl bridge/dump-flows br1 | ofctl_strip | grep -- \"n_packets\" | grep -- \"table_id\" | sed -e 's/output:[0-9][0-9]*/output/' "
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:196"
+( $at_check_trace; ovs-appctl bridge/dump-flows br1 | ofctl_strip | grep -- "n_packets" | grep -- "table_id" | sed -e 's/output:[0-9][0-9]*/output/'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "table_id=254, n_packets=1, n_bytes=64, priority=20,recirc_id=0x2,dp_hash=0x0/0xff,actions=output
+echo >>"$at_stdout"; $as_echo "table_id=254, n_packets=1, n_bytes=64, priority=20,recirc_id=0x0,dp_hash=0x0/0xff,actions=output
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:197"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:196"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106371,10 +106854,10 @@
 
 # Checks the flow stats in br-int, should be only one match.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:202: ovs-ofctl dump-flows br-int | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:202"
+$as_echo "$at_srcdir/ofproto-dpif.at:201: ovs-ofctl dump-flows br-int | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:201"
 ( $at_check_trace; ovs-ofctl dump-flows br-int | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -106383,7 +106866,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:202"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106391,45 +106874,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:208: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:208"
+$as_echo "$at_srcdir/ofproto-dpif.at:207: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:207"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:208"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:207"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:208: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:208"
+$as_echo "$at_srcdir/ofproto-dpif.at:207: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:207"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:208"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:207"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:208: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:208"
+$as_echo "$at_srcdir/ofproto-dpif.at:207: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:207"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:208"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:207"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106439,13 +106922,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_788
-#AT_START_789
-at_fn_group_banner 789 'ofproto-dpif.at:211' \
+#AT_STOP_790
+#AT_START_791
+at_fn_group_banner 791 'ofproto-dpif.at:210' \
   "ofproto-dpif - resubmit" "                        " 52
 at_xfail=no
 (
-  $as_echo "789. $at_setup_line: testing $at_desc ..."
+  $as_echo "791. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -106455,29 +106938,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:212: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:212"
+$as_echo "$at_srcdir/ofproto-dpif.at:211: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:211"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:211"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:212: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:212"
+$as_echo "$at_srcdir/ofproto-dpif.at:211: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:211"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:211"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -106487,49 +106970,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:212: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:211: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:212"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:211"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:211"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:212: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:212"
+$as_echo "$at_srcdir/ofproto-dpif.at:211: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:211"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:212: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:212"
+$as_echo "$at_srcdir/ofproto-dpif.at:211: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:211"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -106541,14 +107024,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:212: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:211: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:212"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:211"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -106556,12 +107039,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106570,15 +107053,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:212: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:212"
+$as_echo "$at_srcdir/ofproto-dpif.at:211: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:211"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106609,92 +107092,92 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:223: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:223"
+$as_echo "$at_srcdir/ofproto-dpif.at:222: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:222"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:223"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:222"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:224: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:224"
+$as_echo "$at_srcdir/ofproto-dpif.at:223: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:223"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:224"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:223"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:225: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:225"
+$as_echo "$at_srcdir/ofproto-dpif.at:224: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:224"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 10,11,12,13,14,15,16,17,18,19,20,21
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:225"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:224"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:228: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:228"
+$as_echo "$at_srcdir/ofproto-dpif.at:227: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:227"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:228"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:227"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:228: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:228"
+$as_echo "$at_srcdir/ofproto-dpif.at:227: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:227"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:228"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:227"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:228: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:228"
+$as_echo "$at_srcdir/ofproto-dpif.at:227: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:227"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:228"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:227"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106704,13 +107187,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_789
-#AT_START_790
-at_fn_group_banner 790 'ofproto-dpif.at:231' \
+#AT_STOP_791
+#AT_START_792
+at_fn_group_banner 792 'ofproto-dpif.at:230' \
   "ofproto-dpif - goto table" "                      " 52
 at_xfail=no
 (
-  $as_echo "790. $at_setup_line: testing $at_desc ..."
+  $as_echo "792. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -106720,29 +107203,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:232: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:232"
+$as_echo "$at_srcdir/ofproto-dpif.at:231: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:231"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:231"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:232: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:232"
+$as_echo "$at_srcdir/ofproto-dpif.at:231: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:231"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:231"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -106752,49 +107235,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:232: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:231: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:232"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:231"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:231"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:232: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:232"
+$as_echo "$at_srcdir/ofproto-dpif.at:231: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:231"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:232: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:232"
+$as_echo "$at_srcdir/ofproto-dpif.at:231: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:231"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -106806,14 +107289,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:232: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:231: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:232"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:231"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -106821,12 +107304,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106835,15 +107318,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:232: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:232"
+$as_echo "$at_srcdir/ofproto-dpif.at:231: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:231"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106858,92 +107341,92 @@
 for i in `seq 1 63`; do echo "table=$i actions=goto_table($(($i+1)))"; done >> flows.txt
 echo "table=64 actions=output(11)" >> flows.txt
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:237: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:237"
+$as_echo "$at_srcdir/ofproto-dpif.at:236: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:236"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:237"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:238: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:238"
+$as_echo "$at_srcdir/ofproto-dpif.at:237: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:237"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:238"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:237"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:239: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:239"
+$as_echo "$at_srcdir/ofproto-dpif.at:238: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:238"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 10,11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:239"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:238"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:242: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:242"
+$as_echo "$at_srcdir/ofproto-dpif.at:241: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:241"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:242"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:242: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:242"
+$as_echo "$at_srcdir/ofproto-dpif.at:241: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:241"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:242"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:242: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:242"
+$as_echo "$at_srcdir/ofproto-dpif.at:241: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:241"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:242"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106953,13 +107436,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_790
-#AT_START_791
-at_fn_group_banner 791 'ofproto-dpif.at:245' \
+#AT_STOP_792
+#AT_START_793
+at_fn_group_banner 793 'ofproto-dpif.at:244' \
   "ofproto-dpif - write actions" "                   " 52
 at_xfail=no
 (
-  $as_echo "791. $at_setup_line: testing $at_desc ..."
+  $as_echo "793. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -106969,29 +107452,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:246: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:246"
+$as_echo "$at_srcdir/ofproto-dpif.at:245: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:245"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:246"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:245"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:246: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:246"
+$as_echo "$at_srcdir/ofproto-dpif.at:245: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:245"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:246"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:245"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -107001,49 +107484,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:246: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:245: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:246"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:245"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:246"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:245"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:246: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:246"
+$as_echo "$at_srcdir/ofproto-dpif.at:245: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:245"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:246"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:245"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:246: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:246"
+$as_echo "$at_srcdir/ofproto-dpif.at:245: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:245"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:246"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:245"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -107055,14 +107538,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:246: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:245: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:246"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:245"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -107070,12 +107553,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:246"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:245"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107084,15 +107567,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:246: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:246"
+$as_echo "$at_srcdir/ofproto-dpif.at:245: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:245"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:246"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:245"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107112,40 +107595,40 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:253: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:253"
+$as_echo "$at_srcdir/ofproto-dpif.at:252: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:252"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:253"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:252"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:254: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:254"
+$as_echo "$at_srcdir/ofproto-dpif.at:253: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:253"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:254"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:253"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:255: tail -2 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:255"
+$as_echo "$at_srcdir/ofproto-dpif.at:254: tail -2 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:254"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -107153,52 +107636,52 @@
 Datapath actions: 10,set(ipv4(src=192.168.3.91)),11,set(ipv4(src=192.168.3.90)),13
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:255"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:254"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:259: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:259"
+$as_echo "$at_srcdir/ofproto-dpif.at:258: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:258"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:259"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:258"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:259: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:259"
+$as_echo "$at_srcdir/ofproto-dpif.at:258: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:258"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:259"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:258"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:259: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:259"
+$as_echo "$at_srcdir/ofproto-dpif.at:258: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:258"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:259"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:258"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107208,13 +107691,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_791
-#AT_START_792
-at_fn_group_banner 792 'ofproto-dpif.at:262' \
+#AT_STOP_793
+#AT_START_794
+at_fn_group_banner 794 'ofproto-dpif.at:261' \
   "ofproto-dpif - modify IPv6 Neighbor Solitication (ND)" "" 52
 at_xfail=no
 (
-  $as_echo "792. $at_setup_line: testing $at_desc ..."
+  $as_echo "794. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -107224,29 +107707,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:263: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:263"
+$as_echo "$at_srcdir/ofproto-dpif.at:262: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:262"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:262"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:263: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:263"
+$as_echo "$at_srcdir/ofproto-dpif.at:262: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:262"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:262"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -107256,49 +107739,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:263: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:262: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:263"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:262"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:262"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:263: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:263"
+$as_echo "$at_srcdir/ofproto-dpif.at:262: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:262"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:262"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:263: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:263"
+$as_echo "$at_srcdir/ofproto-dpif.at:262: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:262"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:262"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -107310,14 +107793,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:263: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:262: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:263"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:262"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -107325,12 +107808,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:262"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107339,15 +107822,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:263: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:263"
+$as_echo "$at_srcdir/ofproto-dpif.at:262: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:262"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:262"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107367,40 +107850,40 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:270: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:270"
+$as_echo "$at_srcdir/ofproto-dpif.at:269: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:269"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:270"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:269"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:271: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,icmp6,ipv6_src=fe80::1,ipv6_dst=fe80::2,nw_tos=0,nw_ttl=128,icmpv6_type=135,nd_target=fe80::2020,nd_sll=66:55:44:33:22:11'"
-at_fn_check_prepare_trace "ofproto-dpif.at:271"
+$as_echo "$at_srcdir/ofproto-dpif.at:270: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,icmp6,ipv6_src=fe80::1,ipv6_dst=fe80::2,nw_tos=0,nw_ttl=128,icmpv6_type=135,nd_target=fe80::2020,nd_sll=66:55:44:33:22:11'"
+at_fn_check_prepare_trace "ofproto-dpif.at:270"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,icmp6,ipv6_src=fe80::1,ipv6_dst=fe80::2,nw_tos=0,nw_ttl=128,icmpv6_type=135,nd_target=fe80::2020,nd_sll=66:55:44:33:22:11'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:271"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:270"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:272: tail -4 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:272"
+$as_echo "$at_srcdir/ofproto-dpif.at:271: tail -4 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:271"
 ( $at_check_trace; tail -4 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -107410,52 +107893,52 @@
 	- Uses action(s) not supported by datapath.
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:272"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:278: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:278"
+$as_echo "$at_srcdir/ofproto-dpif.at:277: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:277"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:278"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:278: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:278"
+$as_echo "$at_srcdir/ofproto-dpif.at:277: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:277"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:278"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:278: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:278"
+$as_echo "$at_srcdir/ofproto-dpif.at:277: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:277"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:278"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107465,13 +107948,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_792
-#AT_START_793
-at_fn_group_banner 793 'ofproto-dpif.at:281' \
+#AT_STOP_794
+#AT_START_795
+at_fn_group_banner 795 'ofproto-dpif.at:280' \
   "ofproto-dpif - clear actions" "                   " 52
 at_xfail=no
 (
-  $as_echo "793. $at_setup_line: testing $at_desc ..."
+  $as_echo "795. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -107481,29 +107964,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:282: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:282"
+$as_echo "$at_srcdir/ofproto-dpif.at:281: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:281"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:282"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:281"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:282: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:282"
+$as_echo "$at_srcdir/ofproto-dpif.at:281: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:281"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:282"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:281"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -107513,49 +107996,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:282: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:281: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:282"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:281"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:282"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:281"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:282: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:282"
+$as_echo "$at_srcdir/ofproto-dpif.at:281: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:281"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:282"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:281"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:282: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:282"
+$as_echo "$at_srcdir/ofproto-dpif.at:281: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:281"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:282"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:281"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -107567,14 +108050,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:282: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:281: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:282"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:281"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -107582,12 +108065,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:282"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:281"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107596,15 +108079,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:282: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:282"
+$as_echo "$at_srcdir/ofproto-dpif.at:281: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:281"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:282"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:281"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107622,40 +108105,40 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:288: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:288"
+$as_echo "$at_srcdir/ofproto-dpif.at:287: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:287"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:287"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:289: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=9'"
-at_fn_check_prepare_trace "ofproto-dpif.at:289"
+$as_echo "$at_srcdir/ofproto-dpif.at:288: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=9'"
+at_fn_check_prepare_trace "ofproto-dpif.at:288"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=6,nw_tos=0,nw_ttl=128,tp_src=8,tp_dst=9'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:289"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:288"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:290: tail -2 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:290"
+$as_echo "$at_srcdir/ofproto-dpif.at:289: tail -2 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:289"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -107663,52 +108146,52 @@
 Datapath actions: 10,set(tcp(src=91)),11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:290"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:289"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:294: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:294"
+$as_echo "$at_srcdir/ofproto-dpif.at:293: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:293"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:294"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:293"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:294: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:294"
+$as_echo "$at_srcdir/ofproto-dpif.at:293: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:293"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:294"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:293"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:294: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:294"
+$as_echo "$at_srcdir/ofproto-dpif.at:293: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:293"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:294"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:293"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107718,13 +108201,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_793
-#AT_START_794
-at_fn_group_banner 794 'ofproto-dpif.at:297' \
+#AT_STOP_795
+#AT_START_796
+at_fn_group_banner 796 'ofproto-dpif.at:296' \
   "ofproto-dpif - group chaining not supported" "    " 52
 at_xfail=no
 (
-  $as_echo "794. $at_setup_line: testing $at_desc ..."
+  $as_echo "796. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -107734,29 +108217,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:298: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:298"
+$as_echo "$at_srcdir/ofproto-dpif.at:297: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:297"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:298"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:297"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:298: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:298"
+$as_echo "$at_srcdir/ofproto-dpif.at:297: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:297"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:298"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:297"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -107766,49 +108249,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:298: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:297: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:298"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:297"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:298"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:297"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:298: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:298"
+$as_echo "$at_srcdir/ofproto-dpif.at:297: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:297"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:298"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:297"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:298: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:298"
+$as_echo "$at_srcdir/ofproto-dpif.at:297: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:297"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:298"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:297"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -107820,14 +108303,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:298: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:297: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:298"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:297"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -107835,12 +108318,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:298"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:297"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107849,15 +108332,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:298: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:298"
+$as_echo "$at_srcdir/ofproto-dpif.at:297: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:297"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:298"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:297"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107869,77 +108352,77 @@
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10 \
     -- add-port br0 p11 -- set Interface p11 type=dummy ofport_request=11
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:300: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,set_field:192.168.3.90->ip_src,group:123,bucket=output:11'"
-at_fn_check_prepare_trace "ofproto-dpif.at:300"
+$as_echo "$at_srcdir/ofproto-dpif.at:299: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,set_field:192.168.3.90->ip_src,group:123,bucket=output:11'"
+at_fn_check_prepare_trace "ofproto-dpif.at:299"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,set_field:192.168.3.90->ip_src,group:123,bucket=output:11'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:300"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:299"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:302: sed 's/ (xid=0x[0-9a-fA-F]*)//' stderr | sed 1q"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:302"
+$as_echo "$at_srcdir/ofproto-dpif.at:301: sed 's/ (xid=0x[0-9a-fA-F]*)//' stderr | sed 1q"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:301"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stderr | sed 1q
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPT_ERROR (OF1.2): OFPGMFC_CHAINING_UNSUPPORTED
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:302"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:305: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:305"
+$as_echo "$at_srcdir/ofproto-dpif.at:304: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:304"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:305"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:304"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:305: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:305"
+$as_echo "$at_srcdir/ofproto-dpif.at:304: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:304"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:305"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:304"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:305: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:305"
+$as_echo "$at_srcdir/ofproto-dpif.at:304: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:304"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:305"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:304"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107949,13 +108432,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_794
-#AT_START_795
-at_fn_group_banner 795 'ofproto-dpif.at:308' \
+#AT_STOP_796
+#AT_START_797
+at_fn_group_banner 797 'ofproto-dpif.at:307' \
   "ofproto-dpif - all group in action list" "        " 52
 at_xfail=no
 (
-  $as_echo "795. $at_setup_line: testing $at_desc ..."
+  $as_echo "797. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -107965,29 +108448,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:309: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:309"
+$as_echo "$at_srcdir/ofproto-dpif.at:308: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:308"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:309"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:308"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:309: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:309"
+$as_echo "$at_srcdir/ofproto-dpif.at:308: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:308"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:309"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:308"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -107997,49 +108480,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:309: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:308: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:309"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:308"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:309"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:308"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:309: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:309"
+$as_echo "$at_srcdir/ofproto-dpif.at:308: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:308"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:309"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:308"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:309: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:309"
+$as_echo "$at_srcdir/ofproto-dpif.at:308: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:308"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:309"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:308"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -108051,14 +108534,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:309: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:308: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:309"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:308"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -108066,12 +108549,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:309"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:308"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108080,15 +108563,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:309: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:309"
+$as_echo "$at_srcdir/ofproto-dpif.at:308: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:308"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:309"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:308"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108100,45 +108583,45 @@
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10 \
     -- add-port br0 p11 -- set Interface p11 type=dummy ofport_request=11
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:311: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,set_field:192.168.3.90->ip_src,bucket=output:11'"
-at_fn_check_prepare_trace "ofproto-dpif.at:311"
+$as_echo "$at_srcdir/ofproto-dpif.at:310: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,set_field:192.168.3.90->ip_src,bucket=output:11'"
+at_fn_check_prepare_trace "ofproto-dpif.at:310"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,set_field:192.168.3.90->ip_src,bucket=output:11'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:311"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:310"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:312: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=group:1234'"
-at_fn_check_prepare_trace "ofproto-dpif.at:312"
+$as_echo "$at_srcdir/ofproto-dpif.at:311: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=group:1234'"
+at_fn_check_prepare_trace "ofproto-dpif.at:311"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=group:1234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:312"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:313: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:313"
+$as_echo "$at_srcdir/ofproto-dpif.at:312: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:312"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:313"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:312"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108147,10 +108630,10 @@
 # Must match on the source address to be able to restore it's value for
 # the second bucket
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:316: tail -2 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:316"
+$as_echo "$at_srcdir/ofproto-dpif.at:315: tail -2 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:315"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -108158,52 +108641,52 @@
 Datapath actions: set(ipv4(src=192.168.3.90)),10,set(ipv4(src=192.168.0.1)),11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:316"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:315"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:320: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:320"
+$as_echo "$at_srcdir/ofproto-dpif.at:319: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:319"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:320"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:319"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:320: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:320"
+$as_echo "$at_srcdir/ofproto-dpif.at:319: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:319"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:320"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:319"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:320: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:320"
+$as_echo "$at_srcdir/ofproto-dpif.at:319: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:319"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:320"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:319"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108213,13 +108696,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_795
-#AT_START_796
-at_fn_group_banner 796 'ofproto-dpif.at:323' \
+#AT_STOP_797
+#AT_START_798
+at_fn_group_banner 798 'ofproto-dpif.at:322' \
   "ofproto-dpif - indirect group in action list" "   " 52
 at_xfail=no
 (
-  $as_echo "796. $at_setup_line: testing $at_desc ..."
+  $as_echo "798. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -108229,29 +108712,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:324: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:324"
+$as_echo "$at_srcdir/ofproto-dpif.at:323: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:323"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:324"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:323"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:324: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:324"
+$as_echo "$at_srcdir/ofproto-dpif.at:323: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:323"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:324"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:323"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -108261,49 +108744,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:324: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:323: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:324"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:323"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:324"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:323"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:324: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:324"
+$as_echo "$at_srcdir/ofproto-dpif.at:323: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:323"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:324"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:323"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:324: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:324"
+$as_echo "$at_srcdir/ofproto-dpif.at:323: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:323"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:324"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:323"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -108315,14 +108798,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:324: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:323: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:324"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:323"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -108330,12 +108813,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:324"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:323"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108344,15 +108827,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:324: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:324"
+$as_echo "$at_srcdir/ofproto-dpif.at:323: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:323"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:324"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:323"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108363,107 +108846,107 @@
     -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:326: ovs-ofctl -O OpenFlow12 add-group br0 group_id=1234,type=indirect,bucket=output:10"
-at_fn_check_prepare_trace "ofproto-dpif.at:326"
+$as_echo "$at_srcdir/ofproto-dpif.at:325: ovs-ofctl -O OpenFlow12 add-group br0 group_id=1234,type=indirect,bucket=output:10"
+at_fn_check_prepare_trace "ofproto-dpif.at:325"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 group_id=1234,type=indirect,bucket=output:10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:326"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:325"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:327: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=group:1234'"
-at_fn_check_prepare_trace "ofproto-dpif.at:327"
+$as_echo "$at_srcdir/ofproto-dpif.at:326: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=group:1234'"
+at_fn_check_prepare_trace "ofproto-dpif.at:326"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=group:1234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:327"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:326"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:328: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:328"
+$as_echo "$at_srcdir/ofproto-dpif.at:327: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:327"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:328"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:327"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:329: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:329"
+$as_echo "$at_srcdir/ofproto-dpif.at:328: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:328"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 10
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:329"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:328"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:332: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:332"
+$as_echo "$at_srcdir/ofproto-dpif.at:331: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:331"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:332"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:331"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:332: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:332"
+$as_echo "$at_srcdir/ofproto-dpif.at:331: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:331"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:332"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:331"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:332: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:332"
+$as_echo "$at_srcdir/ofproto-dpif.at:331: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:331"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:332"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:331"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108473,13 +108956,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_796
-#AT_START_797
-at_fn_group_banner 797 'ofproto-dpif.at:335' \
+#AT_STOP_798
+#AT_START_799
+at_fn_group_banner 799 'ofproto-dpif.at:334' \
   "ofproto-dpif - group actions have no effect afterwards" "" 52
 at_xfail=no
 (
-  $as_echo "797. $at_setup_line: testing $at_desc ..."
+  $as_echo "799. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -108489,29 +108972,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:336: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:336"
+$as_echo "$at_srcdir/ofproto-dpif.at:335: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:335"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:335"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:336: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:336"
+$as_echo "$at_srcdir/ofproto-dpif.at:335: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:335"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:335"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -108521,49 +109004,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:336: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:335: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:336"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:335"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:335"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:336: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:336"
+$as_echo "$at_srcdir/ofproto-dpif.at:335: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:335"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:335"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:336: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:336"
+$as_echo "$at_srcdir/ofproto-dpif.at:335: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:335"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:335"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -108575,14 +109058,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:336: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:335: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:336"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:335"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -108590,12 +109073,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:335"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108604,15 +109087,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:336: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:336"
+$as_echo "$at_srcdir/ofproto-dpif.at:335: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:335"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:335"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108623,107 +109106,107 @@
     -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:338: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=set_field:192.168.3.90->ip_src,output:10'"
-at_fn_check_prepare_trace "ofproto-dpif.at:338"
+$as_echo "$at_srcdir/ofproto-dpif.at:337: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=set_field:192.168.3.90->ip_src,output:10'"
+at_fn_check_prepare_trace "ofproto-dpif.at:337"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=set_field:192.168.3.90->ip_src,output:10'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:338"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:337"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:339: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=group:1234,output:10'"
-at_fn_check_prepare_trace "ofproto-dpif.at:339"
+$as_echo "$at_srcdir/ofproto-dpif.at:338: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=group:1234,output:10'"
+at_fn_check_prepare_trace "ofproto-dpif.at:338"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=group:1234,output:10'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:339"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:338"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:340: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:340"
+$as_echo "$at_srcdir/ofproto-dpif.at:339: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:339"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:340"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:339"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:341: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:341"
+$as_echo "$at_srcdir/ofproto-dpif.at:340: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:340"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(ipv4(src=192.168.3.90,dst=192.168.0.2)),10,set(ipv4(src=192.168.0.1,dst=192.168.0.2)),10
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:341"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:340"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:344: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:344"
+$as_echo "$at_srcdir/ofproto-dpif.at:343: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:343"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:344"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:343"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:344: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:344"
+$as_echo "$at_srcdir/ofproto-dpif.at:343: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:343"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:344"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:343"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:344: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:344"
+$as_echo "$at_srcdir/ofproto-dpif.at:343: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:343"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:344"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:343"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108733,13 +109216,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_797
-#AT_START_798
-at_fn_group_banner 798 'ofproto-dpif.at:347' \
+#AT_STOP_799
+#AT_START_800
+at_fn_group_banner 800 'ofproto-dpif.at:346' \
   "ofproto-dpif - all group in action set" "         " 52
 at_xfail=no
 (
-  $as_echo "798. $at_setup_line: testing $at_desc ..."
+  $as_echo "800. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -108749,29 +109232,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:348: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:348"
+$as_echo "$at_srcdir/ofproto-dpif.at:347: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:347"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:348"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:347"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:348: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:348"
+$as_echo "$at_srcdir/ofproto-dpif.at:347: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:347"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:348"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:347"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -108781,49 +109264,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:348: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:347: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:348"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:347"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:348"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:347"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:348: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:348"
+$as_echo "$at_srcdir/ofproto-dpif.at:347: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:347"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:348"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:347"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:348: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:348"
+$as_echo "$at_srcdir/ofproto-dpif.at:347: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:347"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:348"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:347"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -108835,14 +109318,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:348: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:347: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:348"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:347"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -108850,12 +109333,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:348"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:347"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108864,15 +109347,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:348: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:348"
+$as_echo "$at_srcdir/ofproto-dpif.at:347: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:347"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:348"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:347"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108884,45 +109367,45 @@
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10 \
     -- add-port br0 p11 -- set Interface p11 type=dummy ofport_request=11
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:350: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,set_field:192.168.3.90->ip_src,bucket=output:11'"
-at_fn_check_prepare_trace "ofproto-dpif.at:350"
+$as_echo "$at_srcdir/ofproto-dpif.at:349: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,set_field:192.168.3.90->ip_src,bucket=output:11'"
+at_fn_check_prepare_trace "ofproto-dpif.at:349"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,set_field:192.168.3.90->ip_src,bucket=output:11'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:350"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:349"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:351: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:351"
+$as_echo "$at_srcdir/ofproto-dpif.at:350: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:350"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:351"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:350"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:352: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:352"
+$as_echo "$at_srcdir/ofproto-dpif.at:351: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:351"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:352"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:351"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108931,10 +109414,10 @@
 # Must match on the source address to be able to restore it's value for
 # the third bucket
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:355: tail -2 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:355"
+$as_echo "$at_srcdir/ofproto-dpif.at:354: tail -2 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:354"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -108942,52 +109425,52 @@
 Datapath actions: set(ipv4(src=192.168.3.90)),10,set(ipv4(src=192.168.0.1)),11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:355"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:354"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:359: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:359"
+$as_echo "$at_srcdir/ofproto-dpif.at:358: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:358"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:359"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:358"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:359: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:359"
+$as_echo "$at_srcdir/ofproto-dpif.at:358: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:358"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:359"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:358"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:359: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:359"
+$as_echo "$at_srcdir/ofproto-dpif.at:358: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:358"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:359"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:358"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108997,13 +109480,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_798
-#AT_START_799
-at_fn_group_banner 799 'ofproto-dpif.at:362' \
+#AT_STOP_800
+#AT_START_801
+at_fn_group_banner 801 'ofproto-dpif.at:361' \
   "ofproto-dpif - indirect group in action set" "    " 52
 at_xfail=no
 (
-  $as_echo "799. $at_setup_line: testing $at_desc ..."
+  $as_echo "801. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -109013,29 +109496,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:363: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:363"
+$as_echo "$at_srcdir/ofproto-dpif.at:362: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:362"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:363"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:362"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:363: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:363"
+$as_echo "$at_srcdir/ofproto-dpif.at:362: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:362"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:363"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:362"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -109045,49 +109528,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:363: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:362: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:363"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:362"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:363"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:362"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:363: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:363"
+$as_echo "$at_srcdir/ofproto-dpif.at:362: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:362"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:363"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:362"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:363: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:363"
+$as_echo "$at_srcdir/ofproto-dpif.at:362: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:362"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:363"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:362"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -109099,14 +109582,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:363: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:362: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:363"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:362"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -109114,12 +109597,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:363"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:362"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109128,15 +109611,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:363: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:363"
+$as_echo "$at_srcdir/ofproto-dpif.at:362: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:362"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:363"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:362"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109147,107 +109630,107 @@
     -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:365: ovs-ofctl -O OpenFlow12 add-group br0 group_id=1234,type=indirect,bucket=output:10"
-at_fn_check_prepare_trace "ofproto-dpif.at:365"
+$as_echo "$at_srcdir/ofproto-dpif.at:364: ovs-ofctl -O OpenFlow12 add-group br0 group_id=1234,type=indirect,bucket=output:10"
+at_fn_check_prepare_trace "ofproto-dpif.at:364"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 group_id=1234,type=indirect,bucket=output:10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:365"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:364"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:366: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:366"
+$as_echo "$at_srcdir/ofproto-dpif.at:365: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:365"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:366"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:365"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:367: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:367"
+$as_echo "$at_srcdir/ofproto-dpif.at:366: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:366"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:367"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:366"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:368: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:368"
+$as_echo "$at_srcdir/ofproto-dpif.at:367: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:367"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 10
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:368"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:367"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:371: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:371"
+$as_echo "$at_srcdir/ofproto-dpif.at:370: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:370"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:371"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:370"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:371: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:371"
+$as_echo "$at_srcdir/ofproto-dpif.at:370: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:370"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:371"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:370"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:371: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:371"
+$as_echo "$at_srcdir/ofproto-dpif.at:370: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:370"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:371"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:370"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109257,13 +109740,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_799
-#AT_START_800
-at_fn_group_banner 800 'ofproto-dpif.at:374' \
+#AT_STOP_801
+#AT_START_802
+at_fn_group_banner 802 'ofproto-dpif.at:373' \
   "ofproto-dpif - select group" "                    " 52
 at_xfail=no
 (
-  $as_echo "800. $at_setup_line: testing $at_desc ..."
+  $as_echo "802. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -109273,29 +109756,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:375: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:375"
+$as_echo "$at_srcdir/ofproto-dpif.at:374: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:374"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:375"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:374"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:375: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:375"
+$as_echo "$at_srcdir/ofproto-dpif.at:374: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:374"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:375"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:374"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -109305,49 +109788,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:375: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:374: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:375"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:374"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:375"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:374"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:375: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:375"
+$as_echo "$at_srcdir/ofproto-dpif.at:374: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:374"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:375"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:374"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:375: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:375"
+$as_echo "$at_srcdir/ofproto-dpif.at:374: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:374"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:375"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:374"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -109359,14 +109842,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:375: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:374: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:375"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:374"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -109374,12 +109857,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:375"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:374"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109388,15 +109871,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:375: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:375"
+$as_echo "$at_srcdir/ofproto-dpif.at:374: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:374"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:375"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:374"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109408,30 +109891,30 @@
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10 \
     -- add-port br0 p11 -- set Interface p11 type=dummy ofport_request=11
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:377: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=output:10,bucket=output:11'"
-at_fn_check_prepare_trace "ofproto-dpif.at:377"
+$as_echo "$at_srcdir/ofproto-dpif.at:376: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=output:10,bucket=output:11'"
+at_fn_check_prepare_trace "ofproto-dpif.at:376"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=output:10,bucket=output:11'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:377"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:376"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:378: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:378"
+$as_echo "$at_srcdir/ofproto-dpif.at:377: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:377"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:377"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109442,15 +109925,15 @@
 # at least somewhat.
 for d in 0 1 2 3 4 5 6 7 8 9 a b c d e f; do
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:383: ovs-appctl ofproto/trace br0 \"in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:0\$d,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:0$d,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0\"" "ofproto-dpif.at:383"
+$as_echo "$at_srcdir/ofproto-dpif.at:382: ovs-appctl ofproto/trace br0 \"in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:0\$d,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:0$d,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0\"" "ofproto-dpif.at:382"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:0$d,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:383"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:382"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109460,10 +109943,10 @@
 done
 sort results | uniq -c
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:387: sort results | uniq"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:387"
+$as_echo "$at_srcdir/ofproto-dpif.at:386: sort results | uniq"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:386"
 ( $at_check_trace; sort results | uniq
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -109471,52 +109954,52 @@
 Datapath actions: 11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:386"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:391: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:391"
+$as_echo "$at_srcdir/ofproto-dpif.at:390: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:390"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:391"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:390"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:391: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:391"
+$as_echo "$at_srcdir/ofproto-dpif.at:390: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:390"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:391"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:390"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:391: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:391"
+$as_echo "$at_srcdir/ofproto-dpif.at:390: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:390"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:391"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:390"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109526,13 +110009,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_800
-#AT_START_801
-at_fn_group_banner 801 'ofproto-dpif.at:394' \
+#AT_STOP_802
+#AT_START_803
+at_fn_group_banner 803 'ofproto-dpif.at:393' \
   "ofproto-dpif - select group with watch port" "    " 52
 at_xfail=no
 (
-  $as_echo "801. $at_setup_line: testing $at_desc ..."
+  $as_echo "803. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -109542,29 +110025,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:395: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:395"
+$as_echo "$at_srcdir/ofproto-dpif.at:394: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:394"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:395"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:394"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:395: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:395"
+$as_echo "$at_srcdir/ofproto-dpif.at:394: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:394"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:395"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:394"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -109574,49 +110057,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:395: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:394: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:395"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:394"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:395"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:394"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:395: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:395"
+$as_echo "$at_srcdir/ofproto-dpif.at:394: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:394"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:395"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:394"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:395: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:395"
+$as_echo "$at_srcdir/ofproto-dpif.at:394: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:394"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:395"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:394"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -109628,14 +110111,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:395: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:394: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:395"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:394"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -109643,12 +110126,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:395"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:394"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109657,15 +110140,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:395: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:395"
+$as_echo "$at_srcdir/ofproto-dpif.at:394: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:394"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:395"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:394"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109677,107 +110160,107 @@
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10 \
     -- add-port br0 p11 -- set Interface p11 type=dummy ofport_request=11
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:397: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=watch_port:10,output:10,bucket=output:11'"
-at_fn_check_prepare_trace "ofproto-dpif.at:397"
+$as_echo "$at_srcdir/ofproto-dpif.at:396: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=watch_port:10,output:10,bucket=output:11'"
+at_fn_check_prepare_trace "ofproto-dpif.at:396"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=watch_port:10,output:10,bucket=output:11'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:397"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:396"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:398: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:398"
+$as_echo "$at_srcdir/ofproto-dpif.at:397: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:397"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:398"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:397"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:399: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:399"
+$as_echo "$at_srcdir/ofproto-dpif.at:398: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:398"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:399"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:398"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:400: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:400"
+$as_echo "$at_srcdir/ofproto-dpif.at:399: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:399"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:400"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:399"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:403: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:403"
+$as_echo "$at_srcdir/ofproto-dpif.at:402: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:402"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:402"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:403: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:403"
+$as_echo "$at_srcdir/ofproto-dpif.at:402: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:402"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:402"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:403: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:403"
+$as_echo "$at_srcdir/ofproto-dpif.at:402: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:402"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:402"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109787,13 +110270,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_801
-#AT_START_802
-at_fn_group_banner 802 'ofproto-dpif.at:406' \
+#AT_STOP_803
+#AT_START_804
+at_fn_group_banner 804 'ofproto-dpif.at:405' \
   "ofproto-dpif - select group with weight" "        " 52
 at_xfail=no
 (
-  $as_echo "802. $at_setup_line: testing $at_desc ..."
+  $as_echo "804. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -109803,29 +110286,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:407: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:407"
+$as_echo "$at_srcdir/ofproto-dpif.at:406: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:406"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:406"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:407: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:407"
+$as_echo "$at_srcdir/ofproto-dpif.at:406: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:406"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:406"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -109835,49 +110318,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:407: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:406: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:407"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:406"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:406"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:407: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:407"
+$as_echo "$at_srcdir/ofproto-dpif.at:406: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:406"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:406"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:407: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:407"
+$as_echo "$at_srcdir/ofproto-dpif.at:406: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:406"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:406"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -109889,14 +110372,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:407: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:406: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:407"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:406"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -109904,12 +110387,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:406"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109918,15 +110401,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:407: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:407"
+$as_echo "$at_srcdir/ofproto-dpif.at:406: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:406"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:406"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109939,107 +110422,107 @@
     -- add-port br0 p11 -- set Interface p11 type=dummy ofport_request=11 \
     -- add-port br0 p12 -- set Interface p12 type=dummy ofport_request=12
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:409: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=output:10,bucket=output:11,weight=2000,bucket=output:12,weight=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:409"
+$as_echo "$at_srcdir/ofproto-dpif.at:408: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=output:10,bucket=output:11,weight=2000,bucket=output:12,weight=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:408"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=output:10,bucket=output:11,weight=2000,bucket=output:12,weight=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:409"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:408"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:410: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:410"
+$as_echo "$at_srcdir/ofproto-dpif.at:409: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:409"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:410"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:409"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:411: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:411"
+$as_echo "$at_srcdir/ofproto-dpif.at:410: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:410"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:411"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:410"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:412: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:412"
+$as_echo "$at_srcdir/ofproto-dpif.at:411: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:411"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:412"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:411"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:415: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:415"
+$as_echo "$at_srcdir/ofproto-dpif.at:414: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:414"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:415"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:414"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:415: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:415"
+$as_echo "$at_srcdir/ofproto-dpif.at:414: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:414"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:415"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:414"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:415: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:415"
+$as_echo "$at_srcdir/ofproto-dpif.at:414: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:414"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:415"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:414"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110049,13 +110532,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_802
-#AT_START_803
-at_fn_group_banner 803 'ofproto-dpif.at:418' \
+#AT_STOP_804
+#AT_START_805
+at_fn_group_banner 805 'ofproto-dpif.at:417' \
   "ofproto-dpif - select group with hash selection method" "" 52
 at_xfail=no
 (
-  $as_echo "803. $at_setup_line: testing $at_desc ..."
+  $as_echo "805. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -110065,29 +110548,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:419: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:419"
+$as_echo "$at_srcdir/ofproto-dpif.at:418: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:418"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:418"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:419: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:419"
+$as_echo "$at_srcdir/ofproto-dpif.at:418: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:418"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:418"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -110097,49 +110580,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:419: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:418: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:419"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:418"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:418"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:419: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:419"
+$as_echo "$at_srcdir/ofproto-dpif.at:418: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:418"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:418"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:419: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:419"
+$as_echo "$at_srcdir/ofproto-dpif.at:418: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:418"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:418"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -110151,14 +110634,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:419: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:418: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:419"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:418"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -110166,12 +110649,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:418"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110180,15 +110663,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:419: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:419"
+$as_echo "$at_srcdir/ofproto-dpif.at:418: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:418"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:418"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110200,30 +110683,30 @@
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10 \
     -- add-port br0 p11 -- set Interface p11 type=dummy ofport_request=11
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:421: ovs-ofctl -O OpenFlow15 add-group br0 'group_id=1234,type=select,selection_method=hash,fields=eth_dst,bucket=output:10,bucket=output:11'"
-at_fn_check_prepare_trace "ofproto-dpif.at:421"
+$as_echo "$at_srcdir/ofproto-dpif.at:420: ovs-ofctl -O OpenFlow15 add-group br0 'group_id=1234,type=select,selection_method=hash,fields=eth_dst,bucket=output:10,bucket=output:11'"
+at_fn_check_prepare_trace "ofproto-dpif.at:420"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 add-group br0 'group_id=1234,type=select,selection_method=hash,fields=eth_dst,bucket=output:10,bucket=output:11'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:421"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:420"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:422: ovs-ofctl -O OpenFlow15 add-flow br0 'ip actions=write_actions(group:1234)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:422"
+$as_echo "$at_srcdir/ofproto-dpif.at:421: ovs-ofctl -O OpenFlow15 add-flow br0 'ip actions=write_actions(group:1234)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:421"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 add-flow br0 'ip actions=write_actions(group:1234)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:422"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:421"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110234,15 +110717,15 @@
 # at least somewhat.
 for d in 0 1 2 3 4 5 6 7 8 9 a b c d e f; do
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:427: ovs-appctl ofproto/trace br0 \"in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:0\$d,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:0$d,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0\"" "ofproto-dpif.at:427"
+$as_echo "$at_srcdir/ofproto-dpif.at:426: ovs-appctl ofproto/trace br0 \"in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:0\$d,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:0$d,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0\"" "ofproto-dpif.at:426"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "in_port=1,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:0$d,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:427"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:426"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110252,10 +110735,10 @@
 done
 sort results | uniq -c
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:431: sort results | uniq"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:431"
+$as_echo "$at_srcdir/ofproto-dpif.at:430: sort results | uniq"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:430"
 ( $at_check_trace; sort results | uniq
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -110263,7 +110746,7 @@
 Datapath actions: 11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:431"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:430"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110275,15 +110758,15 @@
 # as they only vary a field that is not hashed
 for d in 0 1 2 3 4 5 6 7 8 9 a b c d e f; do
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:440: ovs-appctl ofproto/trace br0 \"in_port=1,dl_src=50:54:00:00:00:\$d,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"in_port=1,dl_src=50:54:00:00:00:$d,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0\"" "ofproto-dpif.at:440"
+$as_echo "$at_srcdir/ofproto-dpif.at:439: ovs-appctl ofproto/trace br0 \"in_port=1,dl_src=50:54:00:00:00:\$d,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"in_port=1,dl_src=50:54:00:00:00:$d,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0\"" "ofproto-dpif.at:439"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "in_port=1,dl_src=50:54:00:00:00:$d,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:440"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:439"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110293,17 +110776,17 @@
 done
 sort results | uniq -c
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:444: sort results | uniq"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:444"
+$as_echo "$at_srcdir/ofproto-dpif.at:443: sort results | uniq"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:443"
 ( $at_check_trace; sort results | uniq
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 10
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:444"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:443"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110311,45 +110794,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:448: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:448"
+$as_echo "$at_srcdir/ofproto-dpif.at:447: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:447"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:448"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:447"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:448: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:448"
+$as_echo "$at_srcdir/ofproto-dpif.at:447: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:447"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:448"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:447"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:448: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:448"
+$as_echo "$at_srcdir/ofproto-dpif.at:447: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:447"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:448"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:447"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110359,13 +110842,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_803
-#AT_START_804
-at_fn_group_banner 804 'ofproto-dpif.at:451' \
+#AT_STOP_805
+#AT_START_806
+at_fn_group_banner 806 'ofproto-dpif.at:450' \
   "ofproto-dpif - fast failover group" "             " 52
 at_xfail=no
 (
-  $as_echo "804. $at_setup_line: testing $at_desc ..."
+  $as_echo "806. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -110375,29 +110858,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:452: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:452"
+$as_echo "$at_srcdir/ofproto-dpif.at:451: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:451"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:452"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:451"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:452: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:452"
+$as_echo "$at_srcdir/ofproto-dpif.at:451: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:451"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:452"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:451"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -110407,49 +110890,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:452: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:451: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:452"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:451"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:452"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:451"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:452: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:452"
+$as_echo "$at_srcdir/ofproto-dpif.at:451: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:451"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:452"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:451"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:452: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:452"
+$as_echo "$at_srcdir/ofproto-dpif.at:451: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:451"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:452"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:451"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -110461,14 +110944,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:452: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:451: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:452"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:451"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -110476,12 +110959,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:452"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:451"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110490,15 +110973,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:452: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:452"
+$as_echo "$at_srcdir/ofproto-dpif.at:451: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:451"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:452"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:451"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110510,107 +110993,107 @@
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10 \
     -- add-port br0 p11 -- set Interface p11 type=dummy ofport_request=11
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:454: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=ff,bucket=watch_port:10,output:10,bucket=watch_port:11,output:11'"
-at_fn_check_prepare_trace "ofproto-dpif.at:454"
+$as_echo "$at_srcdir/ofproto-dpif.at:453: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=ff,bucket=watch_port:10,output:10,bucket=watch_port:11,output:11'"
+at_fn_check_prepare_trace "ofproto-dpif.at:453"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=ff,bucket=watch_port:10,output:10,bucket=watch_port:11,output:11'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:454"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:453"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:455: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:455"
+$as_echo "$at_srcdir/ofproto-dpif.at:454: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:454"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:454"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:456: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:456"
+$as_echo "$at_srcdir/ofproto-dpif.at:455: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:455"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:456"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:455"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:457: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:457"
+$as_echo "$at_srcdir/ofproto-dpif.at:456: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:456"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:457"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:456"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:460: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:460"
+$as_echo "$at_srcdir/ofproto-dpif.at:459: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:459"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:460"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:459"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:460: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:460"
+$as_echo "$at_srcdir/ofproto-dpif.at:459: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:459"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:460"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:459"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:460: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:460"
+$as_echo "$at_srcdir/ofproto-dpif.at:459: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:459"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:460"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:459"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110620,13 +111103,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_804
-#AT_START_805
-at_fn_group_banner 805 'ofproto-dpif.at:463' \
+#AT_STOP_806
+#AT_START_807
+at_fn_group_banner 807 'ofproto-dpif.at:462' \
   "ofproto-dpif - group stats single bucket" "       " 52
 at_xfail=no
 (
-  $as_echo "805. $at_setup_line: testing $at_desc ..."
+  $as_echo "807. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -110636,29 +111119,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:464: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:464"
+$as_echo "$at_srcdir/ofproto-dpif.at:463: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:463"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:464"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:463"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:464: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:464"
+$as_echo "$at_srcdir/ofproto-dpif.at:463: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:463"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:464"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:463"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -110668,49 +111151,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:464: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:463: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:464"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:463"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:464"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:463"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:464: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:464"
+$as_echo "$at_srcdir/ofproto-dpif.at:463: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:463"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:464"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:463"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:464: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:464"
+$as_echo "$at_srcdir/ofproto-dpif.at:463: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:463"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:464"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:463"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -110722,14 +111205,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:464: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:463: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:464"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:463"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -110737,12 +111220,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:464"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:463"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110751,15 +111234,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:464: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:464"
+$as_echo "$at_srcdir/ofproto-dpif.at:463: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:463"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:464"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:463"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110771,30 +111254,30 @@
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10 \
     -- add-port br0 p11 -- set Interface p11 type=dummy ofport_request=11
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:466: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=output:10,weight=2000,bucket=output:11,weight=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:466"
+$as_echo "$at_srcdir/ofproto-dpif.at:465: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=output:10,weight=2000,bucket=output:11,weight=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:465"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=select,bucket=output:10,weight=2000,bucket=output:11,weight=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:466"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:465"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:467: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:467"
+$as_echo "$at_srcdir/ofproto-dpif.at:466: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:466"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:467"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:466"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110805,15 +111288,15 @@
     do
     pkt="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:01:00),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)"
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:472: ovs-appctl netdev-dummy/receive p1 \$pkt"
-at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p1 $pkt" "ofproto-dpif.at:472"
+$as_echo "$at_srcdir/ofproto-dpif.at:471: ovs-appctl netdev-dummy/receive p1 \$pkt"
+at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p1 $pkt" "ofproto-dpif.at:471"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 $pkt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:472"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:471"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110822,40 +111305,40 @@
     done
 )
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:475: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:475"
+$as_echo "$at_srcdir/ofproto-dpif.at:474: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:474"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:475"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:474"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:476: ovs-ofctl -O OpenFlow12 -vwarn dump-group-stats br0"
-at_fn_check_prepare_trace "ofproto-dpif.at:476"
+$as_echo "$at_srcdir/ofproto-dpif.at:475: ovs-ofctl -O OpenFlow12 -vwarn dump-group-stats br0"
+at_fn_check_prepare_trace "ofproto-dpif.at:475"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 -vwarn dump-group-stats br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:476"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:475"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:477: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:477"
+$as_echo "$at_srcdir/ofproto-dpif.at:476: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:476"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -110863,52 +111346,52 @@
 OFPST_GROUP reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:477"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:476"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:481: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:481"
+$as_echo "$at_srcdir/ofproto-dpif.at:480: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:480"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:481"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:480"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:481: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:481"
+$as_echo "$at_srcdir/ofproto-dpif.at:480: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:480"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:481"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:480"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:481: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:481"
+$as_echo "$at_srcdir/ofproto-dpif.at:480: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:480"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:481"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:480"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110918,13 +111401,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_805
-#AT_START_806
-at_fn_group_banner 806 'ofproto-dpif.at:484' \
+#AT_STOP_807
+#AT_START_808
+at_fn_group_banner 808 'ofproto-dpif.at:483' \
   "ofproto-dpif - group stats all buckets" "         " 52
 at_xfail=no
 (
-  $as_echo "806. $at_setup_line: testing $at_desc ..."
+  $as_echo "808. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -110934,29 +111417,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:485: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:485"
+$as_echo "$at_srcdir/ofproto-dpif.at:484: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:484"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:485: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:485"
+$as_echo "$at_srcdir/ofproto-dpif.at:484: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:484"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -110966,49 +111449,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:485: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:484: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:485"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:484"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:485: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:485"
+$as_echo "$at_srcdir/ofproto-dpif.at:484: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:484"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:484"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:485: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:485"
+$as_echo "$at_srcdir/ofproto-dpif.at:484: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:484"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:484"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -111020,14 +111503,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:485: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:484: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:485"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:484"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -111035,12 +111518,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:484"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111049,15 +111532,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:485: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:485"
+$as_echo "$at_srcdir/ofproto-dpif.at:484: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:484"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:484"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111069,30 +111552,30 @@
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10 \
     -- add-port br0 p11 -- set Interface p11 type=dummy ofport_request=11
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:487: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,bucket=output:11'"
-at_fn_check_prepare_trace "ofproto-dpif.at:487"
+$as_echo "$at_srcdir/ofproto-dpif.at:486: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,bucket=output:11'"
+at_fn_check_prepare_trace "ofproto-dpif.at:486"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,bucket=output:11'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:487"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:486"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:488: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:488"
+$as_echo "$at_srcdir/ofproto-dpif.at:487: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:487"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(group:1234)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:488"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:487"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111103,15 +111586,15 @@
     do
     pkt="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:01:00),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)"
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:493: ovs-appctl netdev-dummy/receive p1 \$pkt"
-at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p1 $pkt" "ofproto-dpif.at:493"
+$as_echo "$at_srcdir/ofproto-dpif.at:492: ovs-appctl netdev-dummy/receive p1 \$pkt"
+at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p1 $pkt" "ofproto-dpif.at:492"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 $pkt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:493"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:492"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111120,40 +111603,40 @@
     done
 )
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:496: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:496"
+$as_echo "$at_srcdir/ofproto-dpif.at:495: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:495"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:496"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:495"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:497: ovs-ofctl -O OpenFlow12 -vwarn dump-group-stats br0"
-at_fn_check_prepare_trace "ofproto-dpif.at:497"
+$as_echo "$at_srcdir/ofproto-dpif.at:496: ovs-ofctl -O OpenFlow12 -vwarn dump-group-stats br0"
+at_fn_check_prepare_trace "ofproto-dpif.at:496"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 -vwarn dump-group-stats br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:497"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:496"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:498: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:498"
+$as_echo "$at_srcdir/ofproto-dpif.at:497: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:497"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -111161,52 +111644,52 @@
 OFPST_GROUP reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:498"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:497"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:502: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:502"
+$as_echo "$at_srcdir/ofproto-dpif.at:501: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:501"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:502"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:501"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:502: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:502"
+$as_echo "$at_srcdir/ofproto-dpif.at:501: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:501"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:502"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:501"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:502: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:502"
+$as_echo "$at_srcdir/ofproto-dpif.at:501: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:501"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:502"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:501"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111216,13 +111699,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_806
-#AT_START_807
-at_fn_group_banner 807 'ofproto-dpif.at:505' \
+#AT_STOP_808
+#AT_START_809
+at_fn_group_banner 809 'ofproto-dpif.at:504' \
   "ofproto-dpif - registers" "                       " 52
 at_xfail=no
 (
-  $as_echo "807. $at_setup_line: testing $at_desc ..."
+  $as_echo "809. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -111232,29 +111715,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:506: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:506"
+$as_echo "$at_srcdir/ofproto-dpif.at:505: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:505"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:506"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:505"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:506: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:506"
+$as_echo "$at_srcdir/ofproto-dpif.at:505: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:505"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:506"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:505"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -111264,49 +111747,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:506: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:505: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:506"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:505"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:506"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:505"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:506: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:506"
+$as_echo "$at_srcdir/ofproto-dpif.at:505: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:505"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:506"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:505"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:506: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:506"
+$as_echo "$at_srcdir/ofproto-dpif.at:505: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:505"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:506"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:505"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -111318,14 +111801,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:506: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:505: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:506"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:505"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -111333,12 +111816,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:506"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:505"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111347,15 +111830,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:506: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:506"
+$as_echo "$at_srcdir/ofproto-dpif.at:505: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:505"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:506"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:505"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111393,92 +111876,92 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:532: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:532"
+$as_echo "$at_srcdir/ofproto-dpif.at:531: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:531"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:532"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:531"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:533: ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:533"
+$as_echo "$at_srcdir/ofproto-dpif.at:532: ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:532"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:533"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:532"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:534: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:534"
+$as_echo "$at_srcdir/ofproto-dpif.at:533: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:533"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 20,21,22,33
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:534"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:533"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:537: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:537"
+$as_echo "$at_srcdir/ofproto-dpif.at:536: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:536"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:537"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:536"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:537: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:537"
+$as_echo "$at_srcdir/ofproto-dpif.at:536: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:536"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:537"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:536"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:537: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:537"
+$as_echo "$at_srcdir/ofproto-dpif.at:536: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:536"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:537"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:536"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111488,13 +111971,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_807
-#AT_START_808
-at_fn_group_banner 808 'ofproto-dpif.at:542' \
+#AT_STOP_809
+#AT_START_810
+at_fn_group_banner 810 'ofproto-dpif.at:541' \
   "ofproto-dpif - extended registers" "              " 52
 at_xfail=no
 (
-  $as_echo "808. $at_setup_line: testing $at_desc ..."
+  $as_echo "810. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -111504,29 +111987,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:543: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:543"
+$as_echo "$at_srcdir/ofproto-dpif.at:542: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:542"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:543"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:542"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:543: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:543"
+$as_echo "$at_srcdir/ofproto-dpif.at:542: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:542"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:543"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:542"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -111536,49 +112019,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:543: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:542: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:543"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:542"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:543"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:542"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:543: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:543"
+$as_echo "$at_srcdir/ofproto-dpif.at:542: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:542"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:543"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:542"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:543: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:543"
+$as_echo "$at_srcdir/ofproto-dpif.at:542: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:542"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:543"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:542"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -111590,14 +112073,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:543: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:542: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:543"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:542"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -111605,12 +112088,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:543"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:542"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111619,15 +112102,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:543: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:543"
+$as_echo "$at_srcdir/ofproto-dpif.at:542: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:542"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:543"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:542"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111649,92 +112132,92 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:554: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:554"
+$as_echo "$at_srcdir/ofproto-dpif.at:553: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:553"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:554"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:553"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:555: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:555"
+$as_echo "$at_srcdir/ofproto-dpif.at:554: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:554"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:555"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:554"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:556: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:556"
+$as_echo "$at_srcdir/ofproto-dpif.at:555: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:555"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:556"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:555"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:558: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:558"
+$as_echo "$at_srcdir/ofproto-dpif.at:557: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:557"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:558"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:557"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:558: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:558"
+$as_echo "$at_srcdir/ofproto-dpif.at:557: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:557"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:558"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:557"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:558: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:558"
+$as_echo "$at_srcdir/ofproto-dpif.at:557: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:557"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:558"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:557"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111744,13 +112227,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_808
-#AT_START_809
-at_fn_group_banner 809 'ofproto-dpif.at:561' \
+#AT_STOP_810
+#AT_START_811
+at_fn_group_banner 811 'ofproto-dpif.at:560' \
   "ofproto-dpif - load and move order" "             " 52
 at_xfail=no
 (
-  $as_echo "809. $at_setup_line: testing $at_desc ..."
+  $as_echo "811. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -111760,29 +112243,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:562: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:562"
+$as_echo "$at_srcdir/ofproto-dpif.at:561: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:561"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:562"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:561"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:562: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:562"
+$as_echo "$at_srcdir/ofproto-dpif.at:561: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:561"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:562"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:561"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -111792,49 +112275,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:562: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:561: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:562"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:561"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:562"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:561"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:562: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:562"
+$as_echo "$at_srcdir/ofproto-dpif.at:561: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:561"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:562"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:561"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:562: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:562"
+$as_echo "$at_srcdir/ofproto-dpif.at:561: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:561"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:562"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:561"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -111846,14 +112329,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:562: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:561: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:562"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:561"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -111861,12 +112344,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:562"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:561"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111875,15 +112358,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:562: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:562"
+$as_echo "$at_srcdir/ofproto-dpif.at:561: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:561"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:562"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:561"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111895,55 +112378,55 @@
     -- add-port br0 p10 -- set Interface p10 type=dummy ofport_request=10 \
     -- add-port br0 p11 -- set Interface p11 type=dummy ofport_request=11
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:564: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,move:NXM_NX_REG1[]->NXM_OF_IP_SRC[],bucket=output:11'"
-at_fn_check_prepare_trace "ofproto-dpif.at:564"
+$as_echo "$at_srcdir/ofproto-dpif.at:563: ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,move:NXM_NX_REG1[]->NXM_OF_IP_SRC[],bucket=output:11'"
+at_fn_check_prepare_trace "ofproto-dpif.at:563"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-group br0 'group_id=1234,type=all,bucket=output:10,move:NXM_NX_REG1[]->NXM_OF_IP_SRC[],bucket=output:11'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:564"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:563"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:565: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(load:0xffffffff->NXM_NX_REG1[],move:NXM_NX_REG1[]->NXM_NX_REG2[],group:1234)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:565"
+$as_echo "$at_srcdir/ofproto-dpif.at:564: ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(load:0xffffffff->NXM_NX_REG1[],move:NXM_NX_REG1[]->NXM_NX_REG2[],group:1234)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:564"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip actions=write_actions(load:0xffffffff->NXM_NX_REG1[],move:NXM_NX_REG1[]->NXM_NX_REG2[],group:1234)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:565"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:564"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:566: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
-at_fn_check_prepare_trace "ofproto-dpif.at:566"
+$as_echo "$at_srcdir/ofproto-dpif.at:565: ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'"
+at_fn_check_prepare_trace "ofproto-dpif.at:565"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:566"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:565"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:567: tail -2 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:567"
+$as_echo "$at_srcdir/ofproto-dpif.at:566: tail -2 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:566"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -111951,52 +112434,52 @@
 Datapath actions: set(ipv4(src=255.255.255.255)),10,set(ipv4(src=192.168.0.1)),11
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:567"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:566"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:571: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:571"
+$as_echo "$at_srcdir/ofproto-dpif.at:570: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:570"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:571"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:570"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:571: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:571"
+$as_echo "$at_srcdir/ofproto-dpif.at:570: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:570"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:571"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:570"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:571: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:571"
+$as_echo "$at_srcdir/ofproto-dpif.at:570: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:570"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:571"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:570"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112006,13 +112489,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_809
-#AT_START_810
-at_fn_group_banner 810 'ofproto-dpif.at:575' \
+#AT_STOP_811
+#AT_START_812
+at_fn_group_banner 812 'ofproto-dpif.at:574' \
   "ofproto-dpif - copy-field into extended registers" "" 52
 at_xfail=no
 (
-  $as_echo "810. $at_setup_line: testing $at_desc ..."
+  $as_echo "812. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -112022,29 +112505,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:576: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:576"
+$as_echo "$at_srcdir/ofproto-dpif.at:575: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:575"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:576"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:575"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:576: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:576"
+$as_echo "$at_srcdir/ofproto-dpif.at:575: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:575"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:576"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:575"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -112054,49 +112537,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:576: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:575: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:576"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:575"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:576"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:575"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:576: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:576"
+$as_echo "$at_srcdir/ofproto-dpif.at:575: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:575"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:576"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:575"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:576: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:576"
+$as_echo "$at_srcdir/ofproto-dpif.at:575: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:575"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:576"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:575"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -112108,14 +112591,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:576: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:575: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:576"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:575"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -112123,12 +112606,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:576"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:575"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112137,15 +112620,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:576: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:576"
+$as_echo "$at_srcdir/ofproto-dpif.at:575: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:575"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:576"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:575"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112167,92 +112650,92 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:587: ovs-ofctl -O OpenFlow15 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:587"
+$as_echo "$at_srcdir/ofproto-dpif.at:586: ovs-ofctl -O OpenFlow15 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:586"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:586"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:588: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:588"
+$as_echo "$at_srcdir/ofproto-dpif.at:587: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:587"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:588"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:587"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:589: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:589"
+$as_echo "$at_srcdir/ofproto-dpif.at:588: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:588"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:589"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:588"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:591: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:591"
+$as_echo "$at_srcdir/ofproto-dpif.at:590: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:590"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:591"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:590"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:591: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:591"
+$as_echo "$at_srcdir/ofproto-dpif.at:590: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:590"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:591"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:590"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:591: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:591"
+$as_echo "$at_srcdir/ofproto-dpif.at:590: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:590"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:591"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:590"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112262,13 +112745,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_810
-#AT_START_811
-at_fn_group_banner 811 'ofproto-dpif.at:595' \
+#AT_STOP_812
+#AT_START_813
+at_fn_group_banner 813 'ofproto-dpif.at:594' \
   "ofproto-dpif - masked set-field into metadata" "  " 52
 at_xfail=no
 (
-  $as_echo "811. $at_setup_line: testing $at_desc ..."
+  $as_echo "813. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -112278,29 +112761,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:596: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:596"
+$as_echo "$at_srcdir/ofproto-dpif.at:595: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:595"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:596"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:595"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:596: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:596"
+$as_echo "$at_srcdir/ofproto-dpif.at:595: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:595"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:596"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:595"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -112310,49 +112793,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:596: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:595: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:596"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:595"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:596"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:595"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:596: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:596"
+$as_echo "$at_srcdir/ofproto-dpif.at:595: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:595"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:596"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:595"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:596: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:596"
+$as_echo "$at_srcdir/ofproto-dpif.at:595: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:595"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:596"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:595"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -112364,14 +112847,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:596: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:595: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:596"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:595"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -112379,12 +112862,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:596"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:595"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112393,15 +112876,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:596: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:596"
+$as_echo "$at_srcdir/ofproto-dpif.at:595: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:595"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:596"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:595"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112425,92 +112908,92 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:609: ovs-ofctl -O OpenFlow15 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:609"
+$as_echo "$at_srcdir/ofproto-dpif.at:608: ovs-ofctl -O OpenFlow15 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:608"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:609"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:608"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:610: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:610"
+$as_echo "$at_srcdir/ofproto-dpif.at:609: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:609"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:610"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:609"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:611: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:611"
+$as_echo "$at_srcdir/ofproto-dpif.at:610: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:610"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:611"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:610"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:613: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:613"
+$as_echo "$at_srcdir/ofproto-dpif.at:612: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:612"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:613"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:612"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:613: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:613"
+$as_echo "$at_srcdir/ofproto-dpif.at:612: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:612"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:613"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:612"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:613: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:613"
+$as_echo "$at_srcdir/ofproto-dpif.at:612: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:612"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:613"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:612"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112520,13 +113003,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_811
-#AT_START_812
-at_fn_group_banner 812 'ofproto-dpif.at:617' \
+#AT_STOP_813
+#AT_START_814
+at_fn_group_banner 814 'ofproto-dpif.at:616' \
   "ofproto-dpif - actset_output" "                   " 52
 at_xfail=no
 (
-  $as_echo "812. $at_setup_line: testing $at_desc ..."
+  $as_echo "814. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -112536,29 +113019,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:618: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:618"
+$as_echo "$at_srcdir/ofproto-dpif.at:617: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:617"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:618"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:617"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:618: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:618"
+$as_echo "$at_srcdir/ofproto-dpif.at:617: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:617"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:618"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:617"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -112568,49 +113051,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:618: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:617: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:618"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:617"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:618"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:617"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:618: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:618"
+$as_echo "$at_srcdir/ofproto-dpif.at:617: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:617"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:618"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:617"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:618: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:618"
+$as_echo "$at_srcdir/ofproto-dpif.at:617: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:617"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:618"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:617"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -112622,14 +113105,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:618: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:617: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:618"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:617"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -112637,12 +113120,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:618"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:617"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112651,15 +113134,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:618: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:618"
+$as_echo "$at_srcdir/ofproto-dpif.at:617: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:617"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:618"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:617"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112712,92 +113195,92 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:651: ovs-ofctl -O OpenFlow13 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:651"
+$as_echo "$at_srcdir/ofproto-dpif.at:650: ovs-ofctl -O OpenFlow13 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:650"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:651"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:650"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:652: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:652"
+$as_echo "$at_srcdir/ofproto-dpif.at:651: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:651"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:652"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:651"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:653: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:653"
+$as_echo "$at_srcdir/ofproto-dpif.at:652: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:652"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 4,6,8,10,12,2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:653"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:652"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:655: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:655"
+$as_echo "$at_srcdir/ofproto-dpif.at:654: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:654"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:655"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:654"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:655: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:655"
+$as_echo "$at_srcdir/ofproto-dpif.at:654: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:654"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:655"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:654"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:655: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:655"
+$as_echo "$at_srcdir/ofproto-dpif.at:654: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:654"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:655"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:654"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112807,13 +113290,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_812
-#AT_START_813
-at_fn_group_banner 813 'ofproto-dpif.at:657' \
+#AT_STOP_814
+#AT_START_815
+at_fn_group_banner 815 'ofproto-dpif.at:656' \
   "ofproto-dpif - push-pop" "                        " 52
 at_xfail=no
 (
-  $as_echo "813. $at_setup_line: testing $at_desc ..."
+  $as_echo "815. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -112823,29 +113306,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:658: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:658"
+$as_echo "$at_srcdir/ofproto-dpif.at:657: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:657"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:658"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:657"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:658: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:658"
+$as_echo "$at_srcdir/ofproto-dpif.at:657: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:657"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:658"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:657"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -112855,49 +113338,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:658: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:657: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:658"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:657"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:658"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:657"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:658: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:658"
+$as_echo "$at_srcdir/ofproto-dpif.at:657: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:657"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:658"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:657"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:658: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:658"
+$as_echo "$at_srcdir/ofproto-dpif.at:657: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:657"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:658"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:657"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -112909,14 +113392,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:658: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:657: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:658"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:657"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -112924,12 +113407,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:658"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:657"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112938,15 +113421,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:658: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:658"
+$as_echo "$at_srcdir/ofproto-dpif.at:657: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:657"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:658"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:657"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112969,92 +113452,92 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:668: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:668"
+$as_echo "$at_srcdir/ofproto-dpif.at:667: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:667"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:668"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:667"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:669: ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:669"
+$as_echo "$at_srcdir/ofproto-dpif.at:668: ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:668"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:669"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:668"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:670: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:670"
+$as_echo "$at_srcdir/ofproto-dpif.at:669: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:669"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 33,22,21,20
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:670"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:669"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:673: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:673"
+$as_echo "$at_srcdir/ofproto-dpif.at:672: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:672"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:673"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:672"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:673: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:673"
+$as_echo "$at_srcdir/ofproto-dpif.at:672: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:672"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:673"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:672"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:673: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:673"
+$as_echo "$at_srcdir/ofproto-dpif.at:672: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:672"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:673"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:672"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113064,13 +113547,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_813
-#AT_START_814
-at_fn_group_banner 814 'ofproto-dpif.at:676' \
+#AT_STOP_815
+#AT_START_816
+at_fn_group_banner 816 'ofproto-dpif.at:675' \
   "ofproto-dpif - output" "                          " 52
 at_xfail=no
 (
-  $as_echo "814. $at_setup_line: testing $at_desc ..."
+  $as_echo "816. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -113080,29 +113563,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:677: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:677"
+$as_echo "$at_srcdir/ofproto-dpif.at:676: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:676"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:677"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:676"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:677: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:677"
+$as_echo "$at_srcdir/ofproto-dpif.at:676: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:676"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:677"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:676"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -113112,49 +113595,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:677: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:676: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:677"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:676"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:677"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:676"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:677: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:677"
+$as_echo "$at_srcdir/ofproto-dpif.at:676: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:676"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:677"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:676"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:677: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:677"
+$as_echo "$at_srcdir/ofproto-dpif.at:676: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:676"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:677"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:676"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -113166,14 +113649,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:677: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:676: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:677"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:676"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -113181,12 +113664,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:677"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:676"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113195,15 +113678,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:677: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:677"
+$as_echo "$at_srcdir/ofproto-dpif.at:676: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:676"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:677"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:676"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113231,92 +113714,92 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:689: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:689"
+$as_echo "$at_srcdir/ofproto-dpif.at:688: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:688"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:689"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:688"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:690: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:690"
+$as_echo "$at_srcdir/ofproto-dpif.at:689: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:689"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:690"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:689"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:691: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:691"
+$as_echo "$at_srcdir/ofproto-dpif.at:690: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:690"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 9,55,10,55,66,11,77,88,9,1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:690"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:694: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:694"
+$as_echo "$at_srcdir/ofproto-dpif.at:693: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:693"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:694"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:693"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:694: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:694"
+$as_echo "$at_srcdir/ofproto-dpif.at:693: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:693"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:694"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:693"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:694: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:694"
+$as_echo "$at_srcdir/ofproto-dpif.at:693: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:693"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:694"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:693"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113326,13 +113809,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_814
-#AT_START_815
-at_fn_group_banner 815 'ofproto-dpif.at:697' \
+#AT_STOP_816
+#AT_START_817
+at_fn_group_banner 817 'ofproto-dpif.at:696' \
   "ofproto-dpif - dec_ttl" "                         " 52
 at_xfail=no
 (
-  $as_echo "815. $at_setup_line: testing $at_desc ..."
+  $as_echo "817. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -113342,29 +113825,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:698: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:698"
+$as_echo "$at_srcdir/ofproto-dpif.at:697: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:697"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:698"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:697"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:698: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:698"
+$as_echo "$at_srcdir/ofproto-dpif.at:697: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:697"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:698"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:697"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -113374,49 +113857,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:698: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:697: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:698"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:697"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:698"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:697"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:698: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:698"
+$as_echo "$at_srcdir/ofproto-dpif.at:697: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:697"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:698"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:697"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:698: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:698"
+$as_echo "$at_srcdir/ofproto-dpif.at:697: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:697"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:698"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:697"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -113428,14 +113911,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:698: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:697: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:698"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:697"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -113443,12 +113926,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:698"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:697"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113457,15 +113940,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:698: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:698"
+$as_echo "$at_srcdir/ofproto-dpif.at:697: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:697"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:698"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:697"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113483,40 +113966,40 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:704: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:704"
+$as_echo "$at_srcdir/ofproto-dpif.at:703: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:703"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:704"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:703"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:705: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=111,tos=0,ttl=2,frag=no)' -generate"
-at_fn_check_prepare_trace "ofproto-dpif.at:705"
+$as_echo "$at_srcdir/ofproto-dpif.at:704: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=111,tos=0,ttl=2,frag=no)' -generate"
+at_fn_check_prepare_trace "ofproto-dpif.at:704"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=111,tos=0,ttl=2,frag=no)' -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:705"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:704"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:706: tail -4 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:706"
+$as_echo "$at_srcdir/ofproto-dpif.at:705: tail -4 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:705"
 ( $at_check_trace; tail -4 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -113526,32 +114009,32 @@
 	- Sends \"packet-in\" messages to the OpenFlow controller.
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:706"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:705"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:712: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=111,tos=0,ttl=3,frag=no)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:712"
+$as_echo "$at_srcdir/ofproto-dpif.at:711: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=111,tos=0,ttl=3,frag=no)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:711"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=111,tos=0,ttl=3,frag=no)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:712"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:711"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:713: tail -2 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:713"
+$as_echo "$at_srcdir/ofproto-dpif.at:712: tail -2 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:712"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -113559,32 +114042,32 @@
 Datapath actions: set(ipv4(ttl=2)),2,set(ipv4(ttl=1)),3,4
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:713"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:712"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:717: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x86dd),ipv6(src=::1,dst=::2,label=0,proto=10,tclass=0x70,hlimit=128,frag=no)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:717"
+$as_echo "$at_srcdir/ofproto-dpif.at:716: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x86dd),ipv6(src=::1,dst=::2,label=0,proto=10,tclass=0x70,hlimit=128,frag=no)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:716"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x86dd),ipv6(src=::1,dst=::2,label=0,proto=10,tclass=0x70,hlimit=128,frag=no)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:717"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:716"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:718: tail -2 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:718"
+$as_echo "$at_srcdir/ofproto-dpif.at:717: tail -2 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:717"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -113592,7 +114075,7 @@
 Datapath actions: set(ipv6(hlimit=127)),2,set(ipv6(hlimit=126)),3,4
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:718"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:717"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113601,15 +114084,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:724: ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:724"
+$as_echo "$at_srcdir/ofproto-dpif.at:723: ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:723"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:724"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:723"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -113617,15 +114100,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:725: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=111,tos=0,ttl=2,frag=no)' -generate"
-at_fn_check_prepare_trace "ofproto-dpif.at:725"
+$as_echo "$at_srcdir/ofproto-dpif.at:724: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=111,tos=0,ttl=2,frag=no)' -generate"
+at_fn_check_prepare_trace "ofproto-dpif.at:724"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=111,tos=0,ttl=2,frag=no)' -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:724"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -113633,19 +114116,19 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:726: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:725: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:726"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:725"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:726"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:725"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -113653,10 +114136,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:727: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:727"
+$as_echo "$at_srcdir/ofproto-dpif.at:726: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:726"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -113664,7 +114147,7 @@
 ip,vlan_tci=0x0000,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=111,nw_tos=0,nw_ecn=0,nw_ttl=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:727"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:726"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -113672,15 +114155,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:731: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:731"
+$as_echo "$at_srcdir/ofproto-dpif.at:730: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:730"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:731"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:730"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -113688,15 +114171,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:731: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:731"
+$as_echo "$at_srcdir/ofproto-dpif.at:730: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:730"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:731"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:730"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -113704,15 +114187,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:731: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:731"
+$as_echo "$at_srcdir/ofproto-dpif.at:730: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:730"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:731"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:730"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -113723,13 +114206,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_815
-#AT_START_816
-at_fn_group_banner 816 'ofproto-dpif.at:741' \
+#AT_STOP_817
+#AT_START_818
+at_fn_group_banner 818 'ofproto-dpif.at:740' \
   "ofproto-dpif - dec_ttl without arguments at offset 32 in ofpacts" "" 52
 at_xfail=no
 (
-  $as_echo "816. $at_setup_line: testing $at_desc ..."
+  $as_echo "818. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -113739,29 +114222,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:742: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:742"
+$as_echo "$at_srcdir/ofproto-dpif.at:741: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:741"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:742"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:741"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:742: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:742"
+$as_echo "$at_srcdir/ofproto-dpif.at:741: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:741"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:742"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:741"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -113771,49 +114254,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:742: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:741: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:742"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:741"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:742"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:741"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:742: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:742"
+$as_echo "$at_srcdir/ofproto-dpif.at:741: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:741"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:742"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:741"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:742: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:742"
+$as_echo "$at_srcdir/ofproto-dpif.at:741: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:741"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:742"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:741"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -113825,14 +114308,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:742: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:741: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:742"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:741"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -113840,12 +114323,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:742"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:741"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113854,15 +114337,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:742: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:742"
+$as_echo "$at_srcdir/ofproto-dpif.at:741: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:741"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:742"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:741"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113875,60 +114358,60 @@
   printf "dl_src=10:11:11:11:11:%02x actions=output:1,output:1,output:1,dec_ttl,controller\n" $i
  done) > flows.txt
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:747: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:747"
+$as_echo "$at_srcdir/ofproto-dpif.at:746: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:746"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:747"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:746"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:748: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:748"
+$as_echo "$at_srcdir/ofproto-dpif.at:747: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:747"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:748"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:747"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:748: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:748"
+$as_echo "$at_srcdir/ofproto-dpif.at:747: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:747"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:748"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:747"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:748: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:748"
+$as_echo "$at_srcdir/ofproto-dpif.at:747: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:747"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:748"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:747"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113938,13 +114421,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_816
-#AT_START_817
-at_fn_group_banner 817 'ofproto-dpif.at:758' \
+#AT_STOP_818
+#AT_START_819
+at_fn_group_banner 819 'ofproto-dpif.at:757' \
   "ofproto-dpif - dec_ttl with arguments at offset 32 in ofpacts" "" 52
 at_xfail=no
 (
-  $as_echo "817. $at_setup_line: testing $at_desc ..."
+  $as_echo "819. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -113954,29 +114437,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:759: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:759"
+$as_echo "$at_srcdir/ofproto-dpif.at:758: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:758"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:759"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:758"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:759: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:759"
+$as_echo "$at_srcdir/ofproto-dpif.at:758: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:758"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:759"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:758"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -113986,49 +114469,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:759: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:758: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:759"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:758"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:759"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:758"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:759: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:759"
+$as_echo "$at_srcdir/ofproto-dpif.at:758: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:758"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:759"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:758"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:759: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:759"
+$as_echo "$at_srcdir/ofproto-dpif.at:758: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:758"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:759"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:758"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -114040,14 +114523,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:759: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:758: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:759"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:758"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -114055,12 +114538,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:759"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:758"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114069,15 +114552,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:759: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:759"
+$as_echo "$at_srcdir/ofproto-dpif.at:758: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:758"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:759"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:758"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114090,60 +114573,60 @@
   printf "dl_src=10:11:11:11:11:%02x actions=output:1,output:1,output:1,dec_ttl(1),controller\n" $i
  done) > flows.txt
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:764: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:764"
+$as_echo "$at_srcdir/ofproto-dpif.at:763: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:763"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:764"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:763"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:765: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:765"
+$as_echo "$at_srcdir/ofproto-dpif.at:764: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:764"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:765"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:764"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:765: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:765"
+$as_echo "$at_srcdir/ofproto-dpif.at:764: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:764"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:765"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:764"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:765: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:765"
+$as_echo "$at_srcdir/ofproto-dpif.at:764: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:764"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:765"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:764"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114153,13 +114636,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_817
-#AT_START_818
-at_fn_group_banner 818 'ofproto-dpif.at:775' \
+#AT_STOP_819
+#AT_START_820
+at_fn_group_banner 820 'ofproto-dpif.at:774' \
   "ofproto-dpif - note at offset 24 in ofpacts" "    " 52
 at_xfail=no
 (
-  $as_echo "818. $at_setup_line: testing $at_desc ..."
+  $as_echo "820. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -114169,29 +114652,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:776: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:776"
+$as_echo "$at_srcdir/ofproto-dpif.at:775: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:775"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:776"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:775"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:776: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:776"
+$as_echo "$at_srcdir/ofproto-dpif.at:775: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:775"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:776"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:775"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -114201,49 +114684,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:776: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:775: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:776"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:775"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:776"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:775"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:776: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:776"
+$as_echo "$at_srcdir/ofproto-dpif.at:775: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:775"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:776"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:775"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:776: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:776"
+$as_echo "$at_srcdir/ofproto-dpif.at:775: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:775"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:776"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:775"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -114255,14 +114738,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:776: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:775: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:776"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:775"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -114270,12 +114753,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:776"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:775"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114284,15 +114767,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:776: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:776"
+$as_echo "$at_srcdir/ofproto-dpif.at:775: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:775"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:776"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:775"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114305,60 +114788,60 @@
   printf "dl_src=10:11:11:11:11:%02x actions=output:1,output:1,note:ff,controller\n" $i
  done) > flows.txt
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:781: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:781"
+$as_echo "$at_srcdir/ofproto-dpif.at:780: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:780"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:781"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:780"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:782: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:782"
+$as_echo "$at_srcdir/ofproto-dpif.at:781: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:781"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:782"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:781"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:782: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:782"
+$as_echo "$at_srcdir/ofproto-dpif.at:781: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:781"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:782"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:781"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:782: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:782"
+$as_echo "$at_srcdir/ofproto-dpif.at:781: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:781"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:782"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:781"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114368,13 +114851,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_818
-#AT_START_819
-at_fn_group_banner 819 'ofproto-dpif.at:785' \
+#AT_STOP_820
+#AT_START_821
+at_fn_group_banner 821 'ofproto-dpif.at:784' \
   "ofproto-dpif - output, OFPP_NONE ingress port" "  " 52
 at_xfail=no
 (
-  $as_echo "819. $at_setup_line: testing $at_desc ..."
+  $as_echo "821. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -114384,29 +114867,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:786: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:786"
+$as_echo "$at_srcdir/ofproto-dpif.at:785: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:785"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:786"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:785"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:786: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:786"
+$as_echo "$at_srcdir/ofproto-dpif.at:785: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:785"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:786"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:785"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -114416,49 +114899,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:786: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:785: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:786"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:785"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:786"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:785"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:786: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:786"
+$as_echo "$at_srcdir/ofproto-dpif.at:785: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:785"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:786"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:785"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:786: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:786"
+$as_echo "$at_srcdir/ofproto-dpif.at:785: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:785"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:786"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:785"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -114470,14 +114953,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:786: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:785: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:786"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:785"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -114485,12 +114968,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:786"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:785"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114499,15 +114982,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:786: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:786"
+$as_echo "$at_srcdir/ofproto-dpif.at:785: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:785"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:786"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:785"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114519,15 +115002,15 @@
     -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:789: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "ofproto-dpif.at:789"
+$as_echo "$at_srcdir/ofproto-dpif.at:788: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "ofproto-dpif.at:788"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:789"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:788"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114537,25 +115020,25 @@
 # "in_port" defaults to OFPP_NONE if it's not specified.
 flow="icmp,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,icmp_type=8,icmp_code=0"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:793: ovs-appctl ofproto/trace br0 \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$flow\"" "ofproto-dpif.at:793"
+$as_echo "$at_srcdir/ofproto-dpif.at:792: ovs-appctl ofproto/trace br0 \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$flow\"" "ofproto-dpif.at:792"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:793"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:792"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:794: tail -1 stdout | sed 's/Datapath actions: //' | tr \",\" \"\\n\" | sort -n"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:794"
+$as_echo "$at_srcdir/ofproto-dpif.at:793: tail -1 stdout | sed 's/Datapath actions: //' | tr \",\" \"\\n\" | sort -n"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:793"
 ( $at_check_trace; tail -1 stdout | sed 's/Datapath actions: //' | tr "," "\n" | sort -n
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -114564,7 +115047,7 @@
 100
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:794"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:793"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114572,45 +115055,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:800: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:800"
+$as_echo "$at_srcdir/ofproto-dpif.at:799: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:799"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:800"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:799"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:800: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:800"
+$as_echo "$at_srcdir/ofproto-dpif.at:799: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:799"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:800"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:799"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:800: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:800"
+$as_echo "$at_srcdir/ofproto-dpif.at:799: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:799"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:800"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:799"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114620,13 +115103,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_819
-#AT_START_820
-at_fn_group_banner 820 'ofproto-dpif.at:803' \
+#AT_STOP_821
+#AT_START_822
+at_fn_group_banner 822 'ofproto-dpif.at:802' \
   "ofproto-dpif - DSCP" "                            " 52
 at_xfail=no
 (
-  $as_echo "820. $at_setup_line: testing $at_desc ..."
+  $as_echo "822. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -114636,29 +115119,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:804: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:804"
+$as_echo "$at_srcdir/ofproto-dpif.at:803: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:803"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:803"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:804: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:804"
+$as_echo "$at_srcdir/ofproto-dpif.at:803: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:803"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:803"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -114668,49 +115151,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:804: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:803: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:804"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:803"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:803"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:804: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:804"
+$as_echo "$at_srcdir/ofproto-dpif.at:803: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:803"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:803"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:804: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:804"
+$as_echo "$at_srcdir/ofproto-dpif.at:803: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:803"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:803"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -114722,14 +115205,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:804: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:803: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:804"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:803"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -114737,12 +115220,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:803"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114751,15 +115234,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:804: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy "
-at_fn_check_prepare_trace "ofproto-dpif.at:804"
+$as_echo "$at_srcdir/ofproto-dpif.at:803: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy "
+at_fn_check_prepare_trace "ofproto-dpif.at:803"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:804"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:803"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114773,63 +115256,63 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:809: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:809"
+$as_echo "$at_srcdir/ofproto-dpif.at:808: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:808"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:809"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:808"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:810: ovs-vsctl -- \\
+$as_echo "$at_srcdir/ofproto-dpif.at:809: ovs-vsctl -- \\
         set Port p1 qos=@newqos --\\
         --id=@newqos create QoS type=linux-htb queues=1=@q1,2=@q2 --\\
         --id=@q1 create Queue dscp=1 --\\
         --id=@q2 create Queue dscp=2"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:810"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:809"
 ( $at_check_trace; ovs-vsctl -- \
         set Port p1 qos=@newqos --\
         --id=@newqos create QoS type=linux-htb queues=1=@q1,2=@q2 --\
         --id=@q1 create Queue dscp=1 --\
         --id=@q2 create Queue dscp=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:810"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:809"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:815: ovs-appctl ofproto/trace ovs-dummy 'in_port(9),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=1.1.1.1,dst=2.2.2.2,proto=1,tos=0xff,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:815"
+$as_echo "$at_srcdir/ofproto-dpif.at:814: ovs-appctl ofproto/trace ovs-dummy 'in_port(9),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=1.1.1.1,dst=2.2.2.2,proto=1,tos=0xff,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:814"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(9),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=1.1.1.1,dst=2.2.2.2,proto=1,tos=0xff,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:815"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:814"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:816: tail -2 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:816"
+$as_echo "$at_srcdir/ofproto-dpif.at:815: tail -2 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:815"
 ( $at_check_trace; tail -2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -114837,52 +115320,52 @@
 Datapath actions: 100,set(ipv4(tos=0x4/0xfc)),set(skb_priority(0x1)),1,set(ipv4(tos=0x8/0xfc)),set(skb_priority(0x2)),1,1,set(ipv4(tos=0x4/0xfc)),set(skb_priority(0x1)),1,set(ipv4(tos=0xfc/0xfc)),set(skb_priority(0)),1,set(ipv4(tos=0/0xfc)),1,100
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:816"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:815"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:827: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:827"
+$as_echo "$at_srcdir/ofproto-dpif.at:826: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:826"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:827"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:826"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:827: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:827"
+$as_echo "$at_srcdir/ofproto-dpif.at:826: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:826"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:827"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:826"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:827: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:827"
+$as_echo "$at_srcdir/ofproto-dpif.at:826: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:826"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:827"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:826"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114892,13 +115375,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_820
-#AT_START_821
-at_fn_group_banner 821 'ofproto-dpif.at:830' \
+#AT_STOP_822
+#AT_START_823
+at_fn_group_banner 823 'ofproto-dpif.at:829' \
   "ofproto-dpif - output/flood flags" "              " 52
 at_xfail=no
 (
-  $as_echo "821. $at_setup_line: testing $at_desc ..."
+  $as_echo "823. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -114908,29 +115391,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:831: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:831"
+$as_echo "$at_srcdir/ofproto-dpif.at:830: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:830"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:831"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:830"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:831: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:831"
+$as_echo "$at_srcdir/ofproto-dpif.at:830: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:830"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:831"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:830"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -114940,49 +115423,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:831: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:830: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:831"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:830"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:831"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:830"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:831: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:831"
+$as_echo "$at_srcdir/ofproto-dpif.at:830: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:830"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:831"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:831: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:831"
+$as_echo "$at_srcdir/ofproto-dpif.at:830: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:830"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:831"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -114994,14 +115477,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:831: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:830: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:831"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:830"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -115009,12 +115492,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:831"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115023,15 +115506,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:831: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:831"
+$as_echo "$at_srcdir/ofproto-dpif.at:830: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:830"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:831"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115056,45 +115539,45 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:841: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:841"
+$as_echo "$at_srcdir/ofproto-dpif.at:840: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:840"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:840"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:842: ovs-ofctl mod-port br0 5 noforward"
-at_fn_check_prepare_trace "ofproto-dpif.at:842"
+$as_echo "$at_srcdir/ofproto-dpif.at:841: ovs-ofctl mod-port br0 5 noforward"
+at_fn_check_prepare_trace "ofproto-dpif.at:841"
 ( $at_check_trace; ovs-ofctl mod-port br0 5 noforward
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:842"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:841"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:843: ovs-ofctl mod-port br0 6 noflood"
-at_fn_check_prepare_trace "ofproto-dpif.at:843"
+$as_echo "$at_srcdir/ofproto-dpif.at:842: ovs-ofctl mod-port br0 6 noflood"
+at_fn_check_prepare_trace "ofproto-dpif.at:842"
 ( $at_check_trace; ovs-ofctl mod-port br0 6 noflood
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:843"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:842"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115102,27 +115585,27 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:845: ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:845"
+$as_echo "$at_srcdir/ofproto-dpif.at:844: ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:844"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:845"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:844"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:846: tail -1 stdout \\
+$as_echo "$at_srcdir/ofproto-dpif.at:845: tail -1 stdout \\
 | sed -e 's/Datapath actions: //' | tr ',' '\\n' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:846"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:845"
 ( $at_check_trace; tail -1 stdout \
 | sed -e 's/Datapath actions: //' | tr ',' '\n' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -115133,7 +115616,7 @@
 7
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115141,27 +115624,27 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:855: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:855"
+$as_echo "$at_srcdir/ofproto-dpif.at:854: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:854"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:855"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:854"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:856: tail -1 stdout \\
+$as_echo "$at_srcdir/ofproto-dpif.at:855: tail -1 stdout \\
 | sed -e 's/Datapath actions: //' | tr ',' '\\n' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:856"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:855"
 ( $at_check_trace; tail -1 stdout \
 | sed -e 's/Datapath actions: //' | tr ',' '\n' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -115172,7 +115655,7 @@
 7
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:856"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:855"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115180,27 +115663,27 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:865: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:865"
+$as_echo "$at_srcdir/ofproto-dpif.at:864: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:864"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:865"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:864"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:866: tail -1 stdout \\
+$as_echo "$at_srcdir/ofproto-dpif.at:865: tail -1 stdout \\
 | sed -e 's/Datapath actions: //' | tr ',' '\\n' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:866"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:865"
 ( $at_check_trace; tail -1 stdout \
 | sed -e 's/Datapath actions: //' | tr ',' '\n' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -115212,7 +115695,7 @@
 7
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:866"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:865"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115220,32 +115703,32 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:876: ovs-appctl ofproto/trace ovs-dummy 'in_port(3),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:876"
+$as_echo "$at_srcdir/ofproto-dpif.at:875: ovs-appctl ofproto/trace ovs-dummy 'in_port(3),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:875"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(3),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:876"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:875"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:877: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:877"
+$as_echo "$at_srcdir/ofproto-dpif.at:876: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:876"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 100,1,2,4,6,7
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:877"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:876"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115253,77 +115736,77 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:881: ovs-appctl ofproto/trace ovs-dummy 'in_port(4),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:881"
+$as_echo "$at_srcdir/ofproto-dpif.at:880: ovs-appctl ofproto/trace ovs-dummy 'in_port(4),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:880"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(4),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:881"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:880"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:882: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:882"
+$as_echo "$at_srcdir/ofproto-dpif.at:881: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:881"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(skb_priority(0x1)),100,1,2,set(skb_priority(0x2)),3,set(skb_priority(0x1)),6,7
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:882"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:881"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:885: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:885"
+$as_echo "$at_srcdir/ofproto-dpif.at:884: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:884"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:885"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:885: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:885"
+$as_echo "$at_srcdir/ofproto-dpif.at:884: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:884"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:885"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:885: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:885"
+$as_echo "$at_srcdir/ofproto-dpif.at:884: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:884"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:885"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115333,13 +115816,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_821
-#AT_START_822
-at_fn_group_banner 822 'ofproto-dpif.at:888' \
+#AT_STOP_823
+#AT_START_824
+at_fn_group_banner 824 'ofproto-dpif.at:887' \
   "ofproto-dpif - Default Table Miss - OF1.0 (OFPTC_TABLE_MISS_CONTROLLER)" "" 52
 at_xfail=no
 (
-  $as_echo "822. $at_setup_line: testing $at_desc ..."
+  $as_echo "824. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -115349,29 +115832,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:889: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:889"
+$as_echo "$at_srcdir/ofproto-dpif.at:888: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:888"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:889"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:888"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:889: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:889"
+$as_echo "$at_srcdir/ofproto-dpif.at:888: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:888"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:889"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:888"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -115381,49 +115864,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:889: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:888: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:889"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:888"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:889"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:888"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:889: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:889"
+$as_echo "$at_srcdir/ofproto-dpif.at:888: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:888"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:889"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:888"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:889: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:889"
+$as_echo "$at_srcdir/ofproto-dpif.at:888: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:888"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:889"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:888"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -115435,14 +115918,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:889: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:888: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:889"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:888"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -115450,12 +115933,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:889"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:888"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115464,17 +115947,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:889: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:888: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:889"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:888"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:889"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:888"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115490,15 +115973,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:896: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:896"
+$as_echo "$at_srcdir/ofproto-dpif.at:895: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:895"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:896"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:895"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115510,19 +115993,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(syn)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:901: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:900: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:901"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:900"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:901"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:900"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115530,19 +116013,19 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:902: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:901: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:902"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:901"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:902"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:901"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115550,10 +116033,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:903: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:903"
+$as_echo "$at_srcdir/ofproto-dpif.at:902: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:902"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -115565,7 +116048,7 @@
 tcp,vlan_tci=0x0000,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=9,tcp_flags=syn tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:903"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:902"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115574,15 +116057,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:914: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:914"
+$as_echo "$at_srcdir/ofproto-dpif.at:913: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:913"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:914"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:913"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115590,17 +116073,17 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:915: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:915"
+$as_echo "$at_srcdir/ofproto-dpif.at:914: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:914"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:915"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:914"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115609,15 +116092,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:919: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:919"
+$as_echo "$at_srcdir/ofproto-dpif.at:918: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:918"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:919"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:918"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115625,15 +116108,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:919: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:919"
+$as_echo "$at_srcdir/ofproto-dpif.at:918: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:918"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:919"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:918"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115641,15 +116124,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:919: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:919"
+$as_echo "$at_srcdir/ofproto-dpif.at:918: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:918"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:919"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:918"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115660,13 +116143,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_822
-#AT_START_823
-at_fn_group_banner 823 'ofproto-dpif.at:922' \
+#AT_STOP_824
+#AT_START_825
+at_fn_group_banner 825 'ofproto-dpif.at:921' \
   "ofproto-dpif - Default Table Miss - OF1.3 (OFPTC_TABLE_MISS_DROP)" "" 52
 at_xfail=no
 (
-  $as_echo "823. $at_setup_line: testing $at_desc ..."
+  $as_echo "825. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -115676,29 +116159,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:923: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:923"
+$as_echo "$at_srcdir/ofproto-dpif.at:922: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:922"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:923"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:922"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:923: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:923"
+$as_echo "$at_srcdir/ofproto-dpif.at:922: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:922"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:923"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:922"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -115708,49 +116191,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:923: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:922: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:923"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:922"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:923"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:922"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:923: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:923"
+$as_echo "$at_srcdir/ofproto-dpif.at:922: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:922"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:923"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:922"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:923: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:923"
+$as_echo "$at_srcdir/ofproto-dpif.at:922: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:922"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:923"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:922"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -115762,14 +116245,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:923: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:922: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:923"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:922"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -115777,12 +116260,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:923"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:922"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115791,17 +116274,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:923: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:922: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:923"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:922"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:923"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:922"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115816,15 +116299,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:929: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "ofproto-dpif.at:929"
+$as_echo "$at_srcdir/ofproto-dpif.at:928: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "ofproto-dpif.at:928"
 ( $at_check_trace; ovs-ofctl del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:929"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:928"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115833,15 +116316,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:931: ovs-ofctl monitor -OOpenFlow13 -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:931"
+$as_echo "$at_srcdir/ofproto-dpif.at:930: ovs-ofctl monitor -OOpenFlow13 -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:930"
 ( $at_check_trace; ovs-ofctl monitor -OOpenFlow13 -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:931"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:930"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115853,19 +116336,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(ack,syn)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:937: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:936: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:937"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:936"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:937"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:936"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115874,15 +116357,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:939: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:939"
+$as_echo "$at_srcdir/ofproto-dpif.at:938: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:938"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:939"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115891,15 +116374,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:942: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:942"
+$as_echo "$at_srcdir/ofproto-dpif.at:941: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:941"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:942"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115907,17 +116390,17 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:943: ovs-ofctl -OOpenFlow13 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:943"
+$as_echo "$at_srcdir/ofproto-dpif.at:942: ovs-ofctl -OOpenFlow13 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:942"
 ( $at_check_trace; ovs-ofctl -OOpenFlow13 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OFPST_FLOW reply (OF1.3):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:943"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:942"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115926,15 +116409,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:947: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:947"
+$as_echo "$at_srcdir/ofproto-dpif.at:946: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:946"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:947"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:946"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115942,15 +116425,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:947: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:947"
+$as_echo "$at_srcdir/ofproto-dpif.at:946: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:946"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:947"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:946"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115958,15 +116441,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:947: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:947"
+$as_echo "$at_srcdir/ofproto-dpif.at:946: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:946"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:947"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:946"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -115977,13 +116460,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_823
-#AT_START_824
-at_fn_group_banner 824 'ofproto-dpif.at:950' \
+#AT_STOP_825
+#AT_START_826
+at_fn_group_banner 826 'ofproto-dpif.at:949' \
   "ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_CONTROLLER" "" 52
 at_xfail=no
 (
-  $as_echo "824. $at_setup_line: testing $at_desc ..."
+  $as_echo "826. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -115993,29 +116476,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:951: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:951"
+$as_echo "$at_srcdir/ofproto-dpif.at:950: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:950"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:951"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:950"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:951: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:951"
+$as_echo "$at_srcdir/ofproto-dpif.at:950: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:950"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:951"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:950"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -116025,49 +116508,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:951: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:950: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:951"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:950"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:951"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:950"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:951: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:951"
+$as_echo "$at_srcdir/ofproto-dpif.at:950: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:950"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:951"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:950"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:951: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:951"
+$as_echo "$at_srcdir/ofproto-dpif.at:950: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:950"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:951"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:950"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -116079,14 +116562,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:951: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:950: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:951"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:950"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -116094,12 +116577,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:951"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:950"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116108,17 +116591,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:951: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:950: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:951"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:950"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:951"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:950"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116133,15 +116616,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:957: ovs-ofctl -OOpenFlow12 add-flow br0 'table=0 actions=goto_table(1)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:957"
+$as_echo "$at_srcdir/ofproto-dpif.at:956: ovs-ofctl -OOpenFlow12 add-flow br0 'table=0 actions=goto_table(1)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:956"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 add-flow br0 'table=0 actions=goto_table(1)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:957"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:956"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116150,15 +116633,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:959: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:959"
+$as_echo "$at_srcdir/ofproto-dpif.at:958: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:958"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:959"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:958"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116170,19 +116653,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(urg,rst)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:964: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:963: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:964"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:963"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:964"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:963"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116190,19 +116673,19 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:965: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:964: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:965"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:964"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:965"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:964"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116210,10 +116693,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:966: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:966"
+$as_echo "$at_srcdir/ofproto-dpif.at:965: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:965"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -116225,7 +116708,7 @@
 tcp,vlan_tci=0x0000,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=9,tcp_flags=rst|urg tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:966"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:965"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116234,15 +116717,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:977: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:977"
+$as_echo "$at_srcdir/ofproto-dpif.at:976: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:976"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:977"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:976"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116250,10 +116733,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:978: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:978"
+$as_echo "$at_srcdir/ofproto-dpif.at:977: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:977"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -116261,7 +116744,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:978"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:977"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116270,15 +116753,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:983: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:983"
+$as_echo "$at_srcdir/ofproto-dpif.at:982: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:982"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:983"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:982"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116286,15 +116769,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:983: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:983"
+$as_echo "$at_srcdir/ofproto-dpif.at:982: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:982"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:983"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:982"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116302,15 +116785,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:983: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:983"
+$as_echo "$at_srcdir/ofproto-dpif.at:982: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:982"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:983"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:982"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116321,13 +116804,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_824
-#AT_START_825
-at_fn_group_banner 825 'ofproto-dpif.at:986' \
+#AT_STOP_826
+#AT_START_827
+at_fn_group_banner 827 'ofproto-dpif.at:985' \
   "ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_CONTROLLER" "" 52
 at_xfail=no
 (
-  $as_echo "825. $at_setup_line: testing $at_desc ..."
+  $as_echo "827. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -116337,29 +116820,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:987: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:987"
+$as_echo "$at_srcdir/ofproto-dpif.at:986: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:986"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:987"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:986"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:987: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:987"
+$as_echo "$at_srcdir/ofproto-dpif.at:986: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:986"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:987"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:986"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -116369,49 +116852,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:987: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:986: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:987"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:986"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:987"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:986"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:987: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:987"
+$as_echo "$at_srcdir/ofproto-dpif.at:986: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:986"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:987"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:987: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:987"
+$as_echo "$at_srcdir/ofproto-dpif.at:986: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:986"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:987"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -116423,14 +116906,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:987: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:986: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:987"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:986"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -116438,12 +116921,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:987"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116452,17 +116935,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:987: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:986: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:987"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:986"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:987"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116477,15 +116960,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:993: ovs-ofctl -OOpenFlow12 add-flow br0 'table=0 actions=resubmit(1,1)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:993"
+$as_echo "$at_srcdir/ofproto-dpif.at:992: ovs-ofctl -OOpenFlow12 add-flow br0 'table=0 actions=resubmit(1,1)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:992"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 add-flow br0 'table=0 actions=resubmit(1,1)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:993"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:992"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116494,15 +116977,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:995: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:995"
+$as_echo "$at_srcdir/ofproto-dpif.at:994: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:994"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:995"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:994"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116515,19 +116998,19 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1001: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:1000: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1001"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1000"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1001"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1000"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116535,15 +117018,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1002: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1002"
+$as_echo "$at_srcdir/ofproto-dpif.at:1001: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1001"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1002"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1001"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116552,15 +117035,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1005: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:1005"
+$as_echo "$at_srcdir/ofproto-dpif.at:1004: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:1004"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1005"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1004"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116568,10 +117051,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1006: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1006"
+$as_echo "$at_srcdir/ofproto-dpif.at:1005: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1005"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -116579,7 +117062,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1006"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1005"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116588,15 +117071,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1011: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:1011"
+$as_echo "$at_srcdir/ofproto-dpif.at:1010: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:1010"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1011"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1010"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116604,15 +117087,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1011: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1011"
+$as_echo "$at_srcdir/ofproto-dpif.at:1010: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1010"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1011"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1010"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116620,15 +117103,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1011: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1011"
+$as_echo "$at_srcdir/ofproto-dpif.at:1010: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1010"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1011"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1010"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116639,13 +117122,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_825
-#AT_START_826
-at_fn_group_banner 826 'ofproto-dpif.at:1014' \
+#AT_STOP_827
+#AT_START_828
+at_fn_group_banner 828 'ofproto-dpif.at:1013' \
   "ofproto-dpif - Table Miss - OFPTC_TABLE_MISS_CONTINUE" "" 52
 at_xfail=no
 (
-  $as_echo "826. $at_setup_line: testing $at_desc ..."
+  $as_echo "828. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -116655,29 +117138,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1015: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1015"
+$as_echo "$at_srcdir/ofproto-dpif.at:1014: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1014"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1015"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1014"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1015: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1015"
+$as_echo "$at_srcdir/ofproto-dpif.at:1014: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1014"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1015"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1014"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -116687,49 +117170,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1015: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1014: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1015"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1014"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1015"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1014"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1015: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:1015"
+$as_echo "$at_srcdir/ofproto-dpif.at:1014: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:1014"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1015"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1014"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1015: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:1015"
+$as_echo "$at_srcdir/ofproto-dpif.at:1014: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:1014"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1015"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1014"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -116741,14 +117224,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1015: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1014: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1015"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1014"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -116756,12 +117239,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1015"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1014"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116770,17 +117253,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1015: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:1014: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1015"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1014"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1015"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1014"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116795,15 +117278,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1021: ovs-ofctl add-flow br0 'table=1 dl_src=10:11:11:11:11:11 actions=controller'"
-at_fn_check_prepare_trace "ofproto-dpif.at:1021"
+$as_echo "$at_srcdir/ofproto-dpif.at:1020: ovs-ofctl add-flow br0 'table=1 dl_src=10:11:11:11:11:11 actions=controller'"
+at_fn_check_prepare_trace "ofproto-dpif.at:1020"
 ( $at_check_trace; ovs-ofctl add-flow br0 'table=1 dl_src=10:11:11:11:11:11 actions=controller'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1021"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1020"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116811,15 +117294,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1022: ovs-ofctl -OOpenFlow11 mod-table br0 all continue"
-at_fn_check_prepare_trace "ofproto-dpif.at:1022"
+$as_echo "$at_srcdir/ofproto-dpif.at:1021: ovs-ofctl -OOpenFlow11 mod-table br0 all continue"
+at_fn_check_prepare_trace "ofproto-dpif.at:1021"
 ( $at_check_trace; ovs-ofctl -OOpenFlow11 mod-table br0 all continue
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1022"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1021"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116828,15 +117311,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1025: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1025"
+$as_echo "$at_srcdir/ofproto-dpif.at:1024: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1024"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1025"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1024"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116848,19 +117331,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1030: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1029: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1030"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1029"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1030"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1029"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116868,19 +117351,19 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1031: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:1030: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1031"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1030"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1031"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1030"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116889,10 +117372,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1033: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1033"
+$as_echo "$at_srcdir/ofproto-dpif.at:1032: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1032"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -116904,7 +117387,7 @@
 tcp,vlan_tci=0x0000,dl_src=10:11:11:11:11:11,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=9,tcp_flags=ack tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1033"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1032"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116913,15 +117396,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1045: ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1045"
+$as_echo "$at_srcdir/ofproto-dpif.at:1044: ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1044"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1045"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1044"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116933,19 +117416,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1050: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1049: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1050"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1049"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1050"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1049"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116953,19 +117436,19 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1051: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:1050: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1051"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1050"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1051"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1050"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116974,10 +117457,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1053: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1053"
+$as_echo "$at_srcdir/ofproto-dpif.at:1052: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1052"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -116989,7 +117472,7 @@
 tcp,vlan_tci=0x0000,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=9,tcp_flags=ack tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1053"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1052"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -116998,15 +117481,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1064: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:1064"
+$as_echo "$at_srcdir/ofproto-dpif.at:1063: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:1063"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1064"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1063"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117014,10 +117497,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1065: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1065"
+$as_echo "$at_srcdir/ofproto-dpif.at:1064: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1064"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -117025,7 +117508,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1065"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1064"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117034,15 +117517,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1070: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:1070"
+$as_echo "$at_srcdir/ofproto-dpif.at:1069: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:1069"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1070"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117050,15 +117533,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1070: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1070"
+$as_echo "$at_srcdir/ofproto-dpif.at:1069: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1069"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1070"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117066,15 +117549,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1070: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1070"
+$as_echo "$at_srcdir/ofproto-dpif.at:1069: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1069"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1070"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117085,13 +117568,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_826
-#AT_START_827
-at_fn_group_banner 827 'ofproto-dpif.at:1073' \
+#AT_STOP_828
+#AT_START_829
+at_fn_group_banner 829 'ofproto-dpif.at:1072' \
   "ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_CONTINUE" "" 52
 at_xfail=no
 (
-  $as_echo "827. $at_setup_line: testing $at_desc ..."
+  $as_echo "829. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -117101,29 +117584,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1074: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1074"
+$as_echo "$at_srcdir/ofproto-dpif.at:1073: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1073"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1073"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1074: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1074"
+$as_echo "$at_srcdir/ofproto-dpif.at:1073: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1073"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1073"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -117133,49 +117616,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1074: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1073: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1074"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1073"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1073"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1074: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:1074"
+$as_echo "$at_srcdir/ofproto-dpif.at:1073: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:1073"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1073"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1074: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:1074"
+$as_echo "$at_srcdir/ofproto-dpif.at:1073: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:1073"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1073"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -117187,14 +117670,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1074: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1073: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1074"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1073"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -117202,12 +117685,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1073"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117216,17 +117699,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1074: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:1073: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1074"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1073"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1073"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117246,15 +117729,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1084: ovs-ofctl -OOpenFlow12 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:1084"
+$as_echo "$at_srcdir/ofproto-dpif.at:1083: ovs-ofctl -OOpenFlow12 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:1083"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1084"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1083"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117262,15 +117745,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1085: ovs-ofctl -OOpenFlow11 mod-table br0 all continue"
-at_fn_check_prepare_trace "ofproto-dpif.at:1085"
+$as_echo "$at_srcdir/ofproto-dpif.at:1084: ovs-ofctl -OOpenFlow11 mod-table br0 all continue"
+at_fn_check_prepare_trace "ofproto-dpif.at:1084"
 ( $at_check_trace; ovs-ofctl -OOpenFlow11 mod-table br0 all continue
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1085"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1084"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117279,15 +117762,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1088: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1088"
+$as_echo "$at_srcdir/ofproto-dpif.at:1087: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1087"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1088"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1087"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117299,19 +117782,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1093: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1092: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1093"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1092"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1093"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1092"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117320,19 +117803,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1094: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1093: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1094"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1093"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1094"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1093"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117341,10 +117824,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1096: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1096"
+$as_echo "$at_srcdir/ofproto-dpif.at:1095: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1095"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -117356,7 +117839,7 @@
 tcp,vlan_tci=0x0000,dl_src=10:11:11:11:11:11,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=9,tcp_flags=ack tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1096"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117365,15 +117848,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1108: ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1108"
+$as_echo "$at_srcdir/ofproto-dpif.at:1107: ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1107"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1108"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1107"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117385,19 +117868,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1113: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1112: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1113"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1112"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1113"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1112"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117405,19 +117888,19 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1114: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:1113: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1114"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1113"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1114"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1113"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117426,10 +117909,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1116: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1116"
+$as_echo "$at_srcdir/ofproto-dpif.at:1115: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1115"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -117441,7 +117924,7 @@
 tcp,vlan_tci=0x0000,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=9,tcp_flags=ack tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1116"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1115"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117450,15 +117933,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1127: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:1127"
+$as_echo "$at_srcdir/ofproto-dpif.at:1126: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:1126"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1127"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1126"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117466,10 +117949,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1128: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1128"
+$as_echo "$at_srcdir/ofproto-dpif.at:1127: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1127"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -117478,7 +117961,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1128"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1127"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117487,15 +117970,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1134: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:1134"
+$as_echo "$at_srcdir/ofproto-dpif.at:1133: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:1133"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1134"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1133"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117503,15 +117986,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1134: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1134"
+$as_echo "$at_srcdir/ofproto-dpif.at:1133: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1133"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1134"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1133"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117519,15 +118002,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1134: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1134"
+$as_echo "$at_srcdir/ofproto-dpif.at:1133: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1133"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1134"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1133"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117538,13 +118021,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_827
-#AT_START_828
-at_fn_group_banner 828 'ofproto-dpif.at:1137' \
+#AT_STOP_829
+#AT_START_830
+at_fn_group_banner 830 'ofproto-dpif.at:1136' \
   "ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_CONTINUE" "" 52
 at_xfail=no
 (
-  $as_echo "828. $at_setup_line: testing $at_desc ..."
+  $as_echo "830. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -117554,29 +118037,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1138: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1138"
+$as_echo "$at_srcdir/ofproto-dpif.at:1137: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1137"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1138"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1137"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1138: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1138"
+$as_echo "$at_srcdir/ofproto-dpif.at:1137: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1137"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1138"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1137"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -117586,49 +118069,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1138: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1137: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1138"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1137"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1138"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1137"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1138: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:1138"
+$as_echo "$at_srcdir/ofproto-dpif.at:1137: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:1137"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1138"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1137"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1138: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:1138"
+$as_echo "$at_srcdir/ofproto-dpif.at:1137: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:1137"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1138"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1137"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -117640,14 +118123,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1138: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1137: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1138"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1137"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -117655,12 +118138,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1138"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1137"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117669,17 +118152,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1138: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:1137: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1138"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1137"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1138"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1137"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117699,15 +118182,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1148: ovs-ofctl -OOpenFlow12 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:1148"
+$as_echo "$at_srcdir/ofproto-dpif.at:1147: ovs-ofctl -OOpenFlow12 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:1147"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1148"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117715,15 +118198,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1149: ovs-ofctl -OOpenFlow11 mod-table br0 all continue"
-at_fn_check_prepare_trace "ofproto-dpif.at:1149"
+$as_echo "$at_srcdir/ofproto-dpif.at:1148: ovs-ofctl -OOpenFlow11 mod-table br0 all continue"
+at_fn_check_prepare_trace "ofproto-dpif.at:1148"
 ( $at_check_trace; ovs-ofctl -OOpenFlow11 mod-table br0 all continue
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1149"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117732,15 +118215,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1152: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1152"
+$as_echo "$at_srcdir/ofproto-dpif.at:1151: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1151"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1152"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1151"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117753,19 +118236,19 @@
 done
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1157: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1156: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1157"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1156"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1157"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1156"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117774,15 +118257,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1159: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1159"
+$as_echo "$at_srcdir/ofproto-dpif.at:1158: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1158"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1159"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1158"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117791,15 +118274,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1163: ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1163"
+$as_echo "$at_srcdir/ofproto-dpif.at:1162: ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1162"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1163"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1162"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117811,19 +118294,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1168: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:1167: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1168"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1167"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1168"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117832,15 +118315,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1170: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1170"
+$as_echo "$at_srcdir/ofproto-dpif.at:1169: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1169"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1170"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1169"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117849,15 +118332,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1173: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:1173"
+$as_echo "$at_srcdir/ofproto-dpif.at:1172: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:1172"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1173"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1172"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117865,10 +118348,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1174: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1174"
+$as_echo "$at_srcdir/ofproto-dpif.at:1173: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1173"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -117877,7 +118360,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1174"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1173"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117886,15 +118369,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1180: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:1180"
+$as_echo "$at_srcdir/ofproto-dpif.at:1179: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:1179"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1180"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117902,15 +118385,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1180: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1180"
+$as_echo "$at_srcdir/ofproto-dpif.at:1179: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1179"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1180"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117918,15 +118401,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1180: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1180"
+$as_echo "$at_srcdir/ofproto-dpif.at:1179: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1179"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1180"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -117937,13 +118420,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_828
-#AT_START_829
-at_fn_group_banner 829 'ofproto-dpif.at:1183' \
+#AT_STOP_830
+#AT_START_831
+at_fn_group_banner 831 'ofproto-dpif.at:1182' \
   "ofproto-dpif - Table Miss - OFPTC_TABLE_MISS_DROP" "" 52
 at_xfail=no
 (
-  $as_echo "829. $at_setup_line: testing $at_desc ..."
+  $as_echo "831. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -117953,29 +118436,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1184: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1184"
+$as_echo "$at_srcdir/ofproto-dpif.at:1183: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1183"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1184"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1183"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1184: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1184"
+$as_echo "$at_srcdir/ofproto-dpif.at:1183: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1183"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1184"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1183"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -117985,49 +118468,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1184: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1183: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1184"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1183"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1184"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1183"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1184: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:1184"
+$as_echo "$at_srcdir/ofproto-dpif.at:1183: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:1183"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1184"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1183"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1184: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:1184"
+$as_echo "$at_srcdir/ofproto-dpif.at:1183: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:1183"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1184"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1183"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -118039,14 +118522,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1184: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1183: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1184"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1183"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -118054,12 +118537,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1184"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1183"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118068,17 +118551,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1184: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:1183: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1184"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1183"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1184"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1183"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118093,15 +118576,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1190: ovs-ofctl -OOpenFlow11 mod-table br0 all drop"
-at_fn_check_prepare_trace "ofproto-dpif.at:1190"
+$as_echo "$at_srcdir/ofproto-dpif.at:1189: ovs-ofctl -OOpenFlow11 mod-table br0 all drop"
+at_fn_check_prepare_trace "ofproto-dpif.at:1189"
 ( $at_check_trace; ovs-ofctl -OOpenFlow11 mod-table br0 all drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1190"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1189"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118110,15 +118593,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1192: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1192"
+$as_echo "$at_srcdir/ofproto-dpif.at:1191: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1191"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1192"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1191"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118130,19 +118613,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1198: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:1197: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1198"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1197"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1198"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1197"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118151,15 +118634,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1200: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1200"
+$as_echo "$at_srcdir/ofproto-dpif.at:1199: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1199"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1200"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1199"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118168,15 +118651,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1203: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:1203"
+$as_echo "$at_srcdir/ofproto-dpif.at:1202: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:1202"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1203"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1202"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118184,17 +118667,17 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1204: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1204"
+$as_echo "$at_srcdir/ofproto-dpif.at:1203: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1203"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1204"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1203"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118203,15 +118686,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1208: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:1208"
+$as_echo "$at_srcdir/ofproto-dpif.at:1207: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:1207"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1208"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1207"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118219,15 +118702,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1208: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1208"
+$as_echo "$at_srcdir/ofproto-dpif.at:1207: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1207"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1208"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1207"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118235,15 +118718,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1208: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1208"
+$as_echo "$at_srcdir/ofproto-dpif.at:1207: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1207"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1208"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1207"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118254,13 +118737,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_829
-#AT_START_830
-at_fn_group_banner 830 'ofproto-dpif.at:1211' \
+#AT_STOP_831
+#AT_START_832
+at_fn_group_banner 832 'ofproto-dpif.at:1210' \
   "ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_DROP" "" 52
 at_xfail=no
 (
-  $as_echo "830. $at_setup_line: testing $at_desc ..."
+  $as_echo "832. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -118270,29 +118753,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1212: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1212"
+$as_echo "$at_srcdir/ofproto-dpif.at:1211: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1211"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1211"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1212: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1212"
+$as_echo "$at_srcdir/ofproto-dpif.at:1211: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1211"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1211"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -118302,49 +118785,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1212: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1211: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1212"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1211"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1211"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1212: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:1212"
+$as_echo "$at_srcdir/ofproto-dpif.at:1211: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:1211"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1212: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:1212"
+$as_echo "$at_srcdir/ofproto-dpif.at:1211: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:1211"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -118356,14 +118839,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1212: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1211: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1212"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1211"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -118371,12 +118854,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118385,17 +118868,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1212: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:1211: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1212"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1211"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1212"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118410,15 +118893,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1218: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "ofproto-dpif.at:1218"
+$as_echo "$at_srcdir/ofproto-dpif.at:1217: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "ofproto-dpif.at:1217"
 ( $at_check_trace; ovs-ofctl del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1218"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1217"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118426,15 +118909,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1219: ovs-ofctl -OOpenFlow12 add-flow br0 'table=0 actions=goto_table(1)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:1219"
+$as_echo "$at_srcdir/ofproto-dpif.at:1218: ovs-ofctl -OOpenFlow12 add-flow br0 'table=0 actions=goto_table(1)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:1218"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 add-flow br0 'table=0 actions=goto_table(1)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1218"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118442,15 +118925,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1220: ovs-ofctl -OOpenFlow11 mod-table br0 all drop"
-at_fn_check_prepare_trace "ofproto-dpif.at:1220"
+$as_echo "$at_srcdir/ofproto-dpif.at:1219: ovs-ofctl -OOpenFlow11 mod-table br0 all drop"
+at_fn_check_prepare_trace "ofproto-dpif.at:1219"
 ( $at_check_trace; ovs-ofctl -OOpenFlow11 mod-table br0 all drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118459,15 +118942,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1222: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1222"
+$as_echo "$at_srcdir/ofproto-dpif.at:1221: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1221"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1222"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1221"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118479,19 +118962,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1228: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:1227: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1228"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1227"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1228"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1227"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118500,15 +118983,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1230: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1230"
+$as_echo "$at_srcdir/ofproto-dpif.at:1229: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1229"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1230"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1229"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118517,15 +119000,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1233: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:1233"
+$as_echo "$at_srcdir/ofproto-dpif.at:1232: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:1232"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1233"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1232"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118533,10 +119016,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1234: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1234"
+$as_echo "$at_srcdir/ofproto-dpif.at:1233: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1233"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -118544,7 +119027,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1234"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118553,15 +119036,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1239: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:1239"
+$as_echo "$at_srcdir/ofproto-dpif.at:1238: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:1238"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1239"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1238"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118569,15 +119052,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1239: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1239"
+$as_echo "$at_srcdir/ofproto-dpif.at:1238: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1238"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1239"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1238"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118585,15 +119068,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1239: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1239"
+$as_echo "$at_srcdir/ofproto-dpif.at:1238: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1238"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1239"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1238"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118604,13 +119087,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_830
-#AT_START_831
-at_fn_group_banner 831 'ofproto-dpif.at:1242' \
+#AT_STOP_832
+#AT_START_833
+at_fn_group_banner 833 'ofproto-dpif.at:1241' \
   "ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_DROP" "" 52
 at_xfail=no
 (
-  $as_echo "831. $at_setup_line: testing $at_desc ..."
+  $as_echo "833. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -118620,29 +119103,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1243: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1243"
+$as_echo "$at_srcdir/ofproto-dpif.at:1242: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1242"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1242"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1243: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1243"
+$as_echo "$at_srcdir/ofproto-dpif.at:1242: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1242"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1242"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -118652,49 +119135,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1243: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1242: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1243"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1242"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1242"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1243: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:1243"
+$as_echo "$at_srcdir/ofproto-dpif.at:1242: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:1242"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1242"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1243: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:1243"
+$as_echo "$at_srcdir/ofproto-dpif.at:1242: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:1242"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1242"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -118706,14 +119189,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1243: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1242: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1243"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1242"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -118721,12 +119204,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1242"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118735,17 +119218,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1243: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:1242: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1243"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1242"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1243"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1242"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118760,15 +119243,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1249: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "ofproto-dpif.at:1249"
+$as_echo "$at_srcdir/ofproto-dpif.at:1248: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "ofproto-dpif.at:1248"
 ( $at_check_trace; ovs-ofctl del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1249"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1248"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118776,15 +119259,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1250: ovs-ofctl -OOpenFlow12 add-flow br0 'table=0 actions=resubmit(1,1)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:1250"
+$as_echo "$at_srcdir/ofproto-dpif.at:1249: ovs-ofctl -OOpenFlow12 add-flow br0 'table=0 actions=resubmit(1,1)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:1249"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 add-flow br0 'table=0 actions=resubmit(1,1)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1250"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1249"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118792,15 +119275,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1251: ovs-ofctl -OOpenFlow11 mod-table br0 all drop"
-at_fn_check_prepare_trace "ofproto-dpif.at:1251"
+$as_echo "$at_srcdir/ofproto-dpif.at:1250: ovs-ofctl -OOpenFlow11 mod-table br0 all drop"
+at_fn_check_prepare_trace "ofproto-dpif.at:1250"
 ( $at_check_trace; ovs-ofctl -OOpenFlow11 mod-table br0 all drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1251"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1250"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118809,15 +119292,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1253: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1253"
+$as_echo "$at_srcdir/ofproto-dpif.at:1252: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1252"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1253"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1252"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118829,19 +119312,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1259: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:1258: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1259"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1258"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1259"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1258"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118850,15 +119333,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1261: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1261"
+$as_echo "$at_srcdir/ofproto-dpif.at:1260: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1260"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1261"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1260"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118867,15 +119350,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1264: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:1264"
+$as_echo "$at_srcdir/ofproto-dpif.at:1263: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:1263"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1264"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1263"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118883,10 +119366,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1265: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1265"
+$as_echo "$at_srcdir/ofproto-dpif.at:1264: ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1264"
 ( $at_check_trace; ovs-ofctl -OOpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -118894,7 +119377,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1265"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1264"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118903,15 +119386,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1270: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:1270"
+$as_echo "$at_srcdir/ofproto-dpif.at:1269: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:1269"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1270"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1269"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118919,15 +119402,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1270: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1270"
+$as_echo "$at_srcdir/ofproto-dpif.at:1269: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1269"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1270"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1269"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118935,15 +119418,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1270: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1270"
+$as_echo "$at_srcdir/ofproto-dpif.at:1269: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1269"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1270"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1269"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -118954,13 +119437,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_831
-#AT_START_832
-at_fn_group_banner 832 'ofproto-dpif.at:1273' \
+#AT_STOP_833
+#AT_START_834
+at_fn_group_banner 834 'ofproto-dpif.at:1272' \
   "ofproto-dpif - controller" "                      " 52
 at_xfail=no
 (
-  $as_echo "832. $at_setup_line: testing $at_desc ..."
+  $as_echo "834. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -118970,29 +119453,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1274: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1274"
+$as_echo "$at_srcdir/ofproto-dpif.at:1273: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1273"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1274"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1273"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1274: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1274"
+$as_echo "$at_srcdir/ofproto-dpif.at:1273: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1273"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1274"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1273"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -119002,49 +119485,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1274: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1273: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1274"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1273"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1274"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1273"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1274: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:1274"
+$as_echo "$at_srcdir/ofproto-dpif.at:1273: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:1273"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1274"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1274: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:1274"
+$as_echo "$at_srcdir/ofproto-dpif.at:1273: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:1273"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1274"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -119056,14 +119539,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1274: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1273: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1274"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1273"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -119071,12 +119554,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1274"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119085,17 +119568,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1274: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:1273: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1274"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1273"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1274"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119126,15 +119609,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1295: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:1295"
+$as_echo "$at_srcdir/ofproto-dpif.at:1294: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:1294"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1295"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1294"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119143,15 +119626,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1298: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1298"
+$as_echo "$at_srcdir/ofproto-dpif.at:1297: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1297"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1298"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1297"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119163,19 +119646,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9),tcp_flags(0x010)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1303: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1302: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1303"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1302"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1303"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1302"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119184,19 +119667,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1304: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1303: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1304"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1303"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1304"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1303"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119205,10 +119688,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1306: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1306"
+$as_echo "$at_srcdir/ofproto-dpif.at:1305: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1305"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -119220,7 +119703,7 @@
 tcp,vlan_tci=0x0000,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=9,tcp_flags=ack tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1306"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1305"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119229,15 +119712,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1318: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1318"
+$as_echo "$at_srcdir/ofproto-dpif.at:1317: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1317"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1318"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1317"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119249,19 +119732,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10),tcp_flags(0x002)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1323: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1322: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1323"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1322"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1323"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1322"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119270,19 +119753,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1324: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1323: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1324"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1323"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1324"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1323"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119291,10 +119774,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1326: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1326"
+$as_echo "$at_srcdir/ofproto-dpif.at:1325: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1325"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -119306,7 +119789,7 @@
 tcp,vlan_tci=0x0000,dl_src=10:11:11:11:11:11,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=10,tcp_flags=syn tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1326"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1325"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119315,15 +119798,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1338: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1338"
+$as_echo "$at_srcdir/ofproto-dpif.at:1337: ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1337"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1338"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1337"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119335,19 +119818,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=30:33:33:33:33:33,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10),tcp_flags(0x001)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1343: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1342: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1343"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1342"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1343"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1342"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119356,19 +119839,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1344: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1343: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1344"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1343"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1344"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1343"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119377,10 +119860,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1346: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1346"
+$as_echo "$at_srcdir/ofproto-dpif.at:1345: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1345"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -119392,7 +119875,7 @@
 tcp,dl_vlan=15,dl_vlan_pcp=0,dl_src=30:33:33:33:33:33,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=10,tcp_flags=fin tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1346"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1345"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119401,15 +119884,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1358: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1358"
+$as_echo "$at_srcdir/ofproto-dpif.at:1357: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1357"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1358"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1357"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119421,19 +119904,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:44:41,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=16,tos=0,ttl=64,frag=no)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1363: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1362: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1363"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1362"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1363"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1362"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119442,19 +119925,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1364: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1363: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1364"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1363"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1364"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1363"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119463,10 +119946,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1366: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1366"
+$as_echo "$at_srcdir/ofproto-dpif.at:1365: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1365"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -119478,7 +119961,7 @@
 ip,dl_vlan=99,dl_vlan_pcp=1,dl_src=40:44:44:44:44:41,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=16,nw_tos=0,nw_ecn=0,nw_ttl=64
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1366"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1365"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119487,15 +119970,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1378: ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1378"
+$as_echo "$at_srcdir/ofproto-dpif.at:1377: ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1377"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1377"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119507,19 +119990,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=20:22:22:22:22:22,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=11),tcp_flags(0x001)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1383: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 18
+$as_echo "$at_srcdir/ofproto-dpif.at:1382: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 18
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1383"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1382"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 18
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1383"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1382"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119529,10 +120012,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1386: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1386"
+$as_echo "$at_srcdir/ofproto-dpif.at:1385: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1385"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -119556,7 +120039,7 @@
 tcp,dl_vlan=80,dl_vlan_pcp=0,dl_src=80:81:81:81:81:81,dl_dst=82:82:82:82:82:82,nw_src=83.83.83.83,nw_dst=84.84.84.84,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=85,tp_dst=86,tcp_flags=fin tcp_csum:316d
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1386"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1385"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119565,15 +120048,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1416: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1416"
+$as_echo "$at_srcdir/ofproto-dpif.at:1415: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1415"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1416"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1415"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119585,19 +120068,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 20 22 22 22 22 22 08 00 45 00 00 1C 00 00 00 00 00 11 00 00 C0 A8 00 01 C0 A8 00 02 00 08 00 0B 00 00 12 34 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1421: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 18
+$as_echo "$at_srcdir/ofproto-dpif.at:1420: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 18
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1421"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1420"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 18
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1421"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1420"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119607,10 +120090,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1424: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1424"
+$as_echo "$at_srcdir/ofproto-dpif.at:1423: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1423"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -119634,7 +120117,7 @@
 udp,dl_vlan=80,dl_vlan_pcp=0,dl_src=80:81:81:81:81:81,dl_dst=82:82:82:82:82:82,nw_src=83.83.83.83,nw_dst=84.84.84.84,nw_tos=0,nw_ecn=0,nw_ttl=0,tp_src=85,tp_dst=86 udp_csum:43a1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1424"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1423"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119643,15 +120126,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1454: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1454"
+$as_echo "$at_srcdir/ofproto-dpif.at:1453: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1453"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1454"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1453"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119664,19 +120147,19 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1460: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 18
+$as_echo "$at_srcdir/ofproto-dpif.at:1459: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 18
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1460"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1459"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 18
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1460"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1459"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119684,19 +120167,19 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1461: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:1460: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1461"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1460"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1461"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1460"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119704,10 +120187,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1462: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1462"
+$as_echo "$at_srcdir/ofproto-dpif.at:1461: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1461"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -119731,7 +120214,7 @@
 arp,vlan_tci=0x0000,dl_src=80:88:88:88:88:88,dl_dst=ff:ff:ff:ff:ff:ff,arp_spa=1.1.1.1,arp_tpa=2.2.2.2,arp_op=2,arp_sha=50:54:00:00:00:05,arp_tha=40:44:44:44:44:41
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1462"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1461"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119740,15 +120223,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1483: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:1483"
+$as_echo "$at_srcdir/ofproto-dpif.at:1482: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:1482"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1483"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1482"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119757,15 +120240,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1486: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1486"
+$as_echo "$at_srcdir/ofproto-dpif.at:1485: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1485"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1486"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1485"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119778,15 +120261,15 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1492: ovs-appctl time/warp 1000"
-at_fn_check_prepare_trace "ofproto-dpif.at:1492"
+$as_echo "$at_srcdir/ofproto-dpif.at:1491: ovs-appctl time/warp 1000"
+at_fn_check_prepare_trace "ofproto-dpif.at:1491"
 ( $at_check_trace; ovs-appctl time/warp 1000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1492"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1491"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119794,19 +120277,19 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1493: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 18
+$as_echo "$at_srcdir/ofproto-dpif.at:1492: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 18
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1493"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1492"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 18
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1493"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1492"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119814,19 +120297,19 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1494: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:1493: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1494"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1493"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1494"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1493"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119834,10 +120317,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1495: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1495"
+$as_echo "$at_srcdir/ofproto-dpif.at:1494: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1494"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -119861,7 +120344,7 @@
 sctp,dl_vlan=80,dl_vlan_pcp=0,dl_src=80:81:81:81:81:81,dl_dst=82:82:82:82:82:82,nw_src=83.83.83.83,nw_dst=84.84.84.84,nw_tos=0,nw_ecn=0,nw_ttl=0,tp_src=85,tp_dst=86 sctp_csum:62051f56
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1495"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1494"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119870,10 +120353,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1524: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1524"
+$as_echo "$at_srcdir/ofproto-dpif.at:1523: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:1523"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -119892,7 +120375,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1524"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1523"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119901,15 +120384,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1540: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:1540"
+$as_echo "$at_srcdir/ofproto-dpif.at:1539: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:1539"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1540"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1539"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119917,15 +120400,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1540: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1540"
+$as_echo "$at_srcdir/ofproto-dpif.at:1539: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1539"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1540"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1539"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119933,15 +120416,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1540: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:1540"
+$as_echo "$at_srcdir/ofproto-dpif.at:1539: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:1539"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1540"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1539"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -119952,13 +120435,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_832
-#AT_START_833
-at_fn_group_banner 833 'ofproto-dpif.at:1543' \
+#AT_STOP_834
+#AT_START_835
+at_fn_group_banner 835 'ofproto-dpif.at:1542' \
   "ofproto-dpif - MPLS handling" "                   " 52
 at_xfail=no
 (
-  $as_echo "833. $at_setup_line: testing $at_desc ..."
+  $as_echo "835. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -119968,29 +120451,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1544: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1544"
+$as_echo "$at_srcdir/ofproto-dpif.at:1543: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:1543"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1544"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1543"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1544: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1544"
+$as_echo "$at_srcdir/ofproto-dpif.at:1543: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:1543"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1544"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1543"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -120000,49 +120483,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1544: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1543: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1544"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1543"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1544"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1543"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1544: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:1544"
+$as_echo "$at_srcdir/ofproto-dpif.at:1543: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:1543"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1544"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1543"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1544: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:1544"
+$as_echo "$at_srcdir/ofproto-dpif.at:1543: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:1543"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1544"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1543"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -120054,14 +120537,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1544: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:1543: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1544"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1543"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -120069,12 +120552,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1544"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1543"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120083,17 +120566,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1544: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:1543: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1544"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1543"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1544"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1543"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120159,15 +120642,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1600: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:1600"
+$as_echo "$at_srcdir/ofproto-dpif.at:1599: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:1599"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1600"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1599"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120176,15 +120659,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1603: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1603"
+$as_echo "$at_srcdir/ofproto-dpif.at:1602: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1602"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1603"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1602"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120196,19 +120679,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:44:42,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=17,tos=0,ttl=64,frag=no),udp(src=7777,dst=80)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1608: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1607: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1608"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1607"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1608"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1607"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120217,19 +120700,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1609: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1608: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1609"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1608"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1609"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1608"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120238,10 +120721,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1611: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1611"
+$as_echo "$at_srcdir/ofproto-dpif.at:1610: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1610"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -120253,7 +120736,7 @@
 mpls,vlan_tci=0x0000,dl_src=40:44:44:44:44:42,dl_dst=50:54:00:00:00:07,mpls_label=10,mpls_tc=3,mpls_ttl=64,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1611"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1610"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120262,15 +120745,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1623: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1623"
+$as_echo "$at_srcdir/ofproto-dpif.at:1622: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1622"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1623"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1622"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120282,19 +120765,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=41:44:44:44:44:42,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=16,tos=0,ttl=64,frag=no)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1628: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1627: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1628"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1627"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1628"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1627"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120303,19 +120786,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1629: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1628: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1629"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1628"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1629"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1628"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120324,10 +120807,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1631: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1631"
+$as_echo "$at_srcdir/ofproto-dpif.at:1630: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1630"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -120339,7 +120822,7 @@
 ip,vlan_tci=0x0000,dl_src=41:44:44:44:44:42,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=16,nw_tos=0,nw_ecn=0,nw_ttl=64
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1631"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1630"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120348,15 +120831,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1643: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1643"
+$as_echo "$at_srcdir/ofproto-dpif.at:1642: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1642"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1643"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1642"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120369,19 +120852,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:44:43,dst=50:54:00:00:00:07),eth_type(0x8847),mpls(label=11,tc=3,ttl=64,bos=1)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1650: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1649: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1650"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1649"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1650"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1649"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120390,19 +120873,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1651: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1650: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1651"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1650"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1651"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1650"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120411,10 +120894,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1653: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1653"
+$as_echo "$at_srcdir/ofproto-dpif.at:1652: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1652"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -120426,7 +120909,7 @@
 mpls,vlan_tci=0x0000,dl_src=40:44:44:44:44:43,dl_dst=50:54:00:00:00:07,mpls_label=10,mpls_tc=3,mpls_ttl=64,mpls_bos=0,mpls_lse1=46912
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1653"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1652"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120435,15 +120918,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1665: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1665"
+$as_echo "$at_srcdir/ofproto-dpif.at:1664: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1664"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1665"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1664"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120455,19 +120938,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:44:44,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=99,pcp=7),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=16,tos=0,ttl=64,frag=no))'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1670: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1669: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1670"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1669"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1670"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1669"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120476,19 +120959,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1671: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1670: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1671"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1670"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1671"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1670"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120497,10 +120980,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1673: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1673"
+$as_echo "$at_srcdir/ofproto-dpif.at:1672: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1672"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -120512,7 +120995,7 @@
 mpls,dl_vlan=99,dl_vlan_pcp=7,dl_src=40:44:44:44:44:44,dl_dst=50:54:00:00:00:07,mpls_label=10,mpls_tc=3,mpls_ttl=64,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1673"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1672"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120521,15 +121004,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1685: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1685"
+$as_echo "$at_srcdir/ofproto-dpif.at:1684: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1684"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1685"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1684"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120541,19 +121024,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:44:45,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=16,tos=0,ttl=64,frag=no)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1690: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1689: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1690"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1689"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1690"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1689"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120562,19 +121045,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1691: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1690: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1691"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1690"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1690"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120583,10 +121066,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1693: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1693"
+$as_echo "$at_srcdir/ofproto-dpif.at:1692: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1692"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -120598,7 +121081,7 @@
 mpls,vlan_tci=0x0000,dl_src=40:44:44:44:44:45,dl_dst=50:54:00:00:00:07,mpls_label=10,mpls_tc=3,mpls_ttl=63,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1693"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1692"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120607,15 +121090,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1705: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1705"
+$as_echo "$at_srcdir/ofproto-dpif.at:1704: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1704"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1705"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1704"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120627,19 +121110,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:44:46,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=16,tos=0,ttl=64,frag=no)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1710: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1709: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1710"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1709"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1710"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1709"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120648,19 +121131,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1711: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1710: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1711"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1710"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1711"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1710"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120669,10 +121152,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1713: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1713"
+$as_echo "$at_srcdir/ofproto-dpif.at:1712: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1712"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -120684,7 +121167,7 @@
 mpls,vlan_tci=0x0000,dl_src=40:44:44:44:44:46,dl_dst=50:54:00:00:00:07,mpls_label=10,mpls_tc=3,mpls_ttl=10,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1713"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1712"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120693,15 +121176,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1725: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1725"
+$as_echo "$at_srcdir/ofproto-dpif.at:1724: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1724"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1725"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1724"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120713,19 +121196,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:44:47,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=16,tos=0,ttl=64,frag=no)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1730: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1729: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1730"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1729"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1729"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120734,19 +121217,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1731: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1730: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1731"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1730"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1731"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1730"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120755,10 +121238,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1733: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1733"
+$as_echo "$at_srcdir/ofproto-dpif.at:1732: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1732"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -120770,7 +121253,7 @@
 mpls,vlan_tci=0x0000,dl_src=40:44:44:44:44:47,dl_dst=50:54:00:00:00:07,mpls_label=10,mpls_tc=3,mpls_ttl=10,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1733"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1732"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120779,15 +121262,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1744: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:1744"
+$as_echo "$at_srcdir/ofproto-dpif.at:1743: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:1743"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1744"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1743"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120796,15 +121279,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1747: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1747"
+$as_echo "$at_srcdir/ofproto-dpif.at:1746: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1746"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1747"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1746"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120816,19 +121299,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:44:49,dst=50:54:00:00:00:07),eth_type(0x8847),mpls(label=10,tc=3,ttl=64,bos=1)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1752: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1751: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1752"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1751"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1752"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1751"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120838,10 +121321,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1755: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1755"
+$as_echo "$at_srcdir/ofproto-dpif.at:1754: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1754"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -120853,7 +121336,7 @@
 mplsm,vlan_tci=0x0000,dl_src=40:44:44:44:44:49,dl_dst=50:54:00:00:00:07,mpls_label=10,mpls_tc=3,mpls_ttl=64,mpls_bos=0,mpls_lse1=42816
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1755"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1754"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120862,15 +121345,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1766: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:1766"
+$as_echo "$at_srcdir/ofproto-dpif.at:1765: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:1765"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1766"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1765"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120879,15 +121362,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1769: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1769"
+$as_echo "$at_srcdir/ofproto-dpif.at:1768: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1768"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1769"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1768"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120899,19 +121382,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:44:48,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=16,tos=0,ttl=64,frag=no)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1774: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1773: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1774"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1773"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1774"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1773"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120920,19 +121403,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1775: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1774: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1775"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1774"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1775"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1774"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120941,10 +121424,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1777: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1777"
+$as_echo "$at_srcdir/ofproto-dpif.at:1776: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1776"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -120956,7 +121439,7 @@
 mpls,vlan_tci=0x0000,dl_src=40:44:44:44:44:48,dl_dst=50:54:00:00:00:07,mpls_label=10,mpls_tc=3,mpls_ttl=9,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1777"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1776"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120965,15 +121448,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1789: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1789"
+$as_echo "$at_srcdir/ofproto-dpif.at:1788: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1788"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1789"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1788"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -120985,19 +121468,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:55:55:55:55:55,dst=50:54:00:00:00:07),eth_type(0x8847),mpls(label=100,tc=7,ttl=64,bos=1)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1794: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1793: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1794"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1793"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1794"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1793"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121006,19 +121489,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1795: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1794: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1795"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1794"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1795"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1794"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121027,10 +121510,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1797: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1797"
+$as_echo "$at_srcdir/ofproto-dpif.at:1796: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1796"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -121042,7 +121525,7 @@
 mpls,vlan_tci=0x0000,dl_src=50:55:55:55:55:55,dl_dst=50:54:00:00:00:07,mpls_label=1000,mpls_tc=7,mpls_ttl=64,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1797"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1796"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121051,15 +121534,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1809: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1809"
+$as_echo "$at_srcdir/ofproto-dpif.at:1808: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1808"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1809"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1808"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121071,19 +121554,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=70:77:77:77:77:77,dst=50:54:00:00:00:07),eth_type(0x86dd),ipv6(src=::1,dst=::2,label=0,proto=10,tclass=0x70,hlimit=128,frag=no)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1814: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1813: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1814"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1813"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1814"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1813"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121092,19 +121575,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1815: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1814: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1815"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1814"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1815"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1814"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121113,10 +121596,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1817: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1817"
+$as_echo "$at_srcdir/ofproto-dpif.at:1816: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1816"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -121128,7 +121611,7 @@
 mplsm,vlan_tci=0x0000,dl_src=70:77:77:77:77:77,dl_dst=50:54:00:00:00:07,mpls_label=1000,mpls_tc=7,mpls_ttl=128,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1817"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1816"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121139,15 +121622,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1834: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1834"
+$as_echo "$at_srcdir/ofproto-dpif.at:1833: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1833"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1834"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1833"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121162,19 +121645,19 @@
 #    ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=60:66:66:66:66:66,dst=50:54:00:00:00:07),eth_type(0x8847),mpls(label=10,tc=3,ttl=100,bos=1)'
 #done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1842: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1841: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1842"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1841"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1842"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1841"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121183,19 +121666,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1843: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1842: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1843"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1842"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1843"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1842"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121204,10 +121687,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1845: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1845"
+$as_echo "$at_srcdir/ofproto-dpif.at:1844: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1844"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -121219,7 +121702,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:66:66,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:7744
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1845"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1844"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121228,15 +121711,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1856: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:1856"
+$as_echo "$at_srcdir/ofproto-dpif.at:1855: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:1855"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1856"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1855"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121245,15 +121728,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1863: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1863"
+$as_echo "$at_srcdir/ofproto-dpif.at:1862: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1862"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1863"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1862"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121265,19 +121748,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 00 01 88 48 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1868: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1867: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1868"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1867"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1868"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1867"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121286,19 +121769,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1869: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1868: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1869"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1868"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1869"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1868"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121307,10 +121790,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1871: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1871"
+$as_echo "$at_srcdir/ofproto-dpif.at:1870: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1870"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -121322,7 +121805,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:00:01,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=254,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:7744
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1871"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1870"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121331,15 +121814,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1882: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:1882"
+$as_echo "$at_srcdir/ofproto-dpif.at:1881: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:1881"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1882"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1881"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121348,15 +121831,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1889: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1889"
+$as_echo "$at_srcdir/ofproto-dpif.at:1888: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1888"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1889"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1888"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121368,19 +121851,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 00 02 88 47 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1894: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1893: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1894"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1893"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1894"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1893"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121389,19 +121872,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1895: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1894: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1895"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1894"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1895"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1894"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121410,10 +121893,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1897: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1897"
+$as_echo "$at_srcdir/ofproto-dpif.at:1896: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1896"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -121425,7 +121908,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:00:02,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=10.0.0.1,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:2dee
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1897"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1896"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121434,15 +121917,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1908: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:1908"
+$as_echo "$at_srcdir/ofproto-dpif.at:1907: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:1907"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1908"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1907"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121451,15 +121934,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1915: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1915"
+$as_echo "$at_srcdir/ofproto-dpif.at:1914: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1914"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1915"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1914"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121471,19 +121954,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 00 03 88 48 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1920: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1919: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1920"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1919"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1920"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1919"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121492,19 +121975,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1921: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1920: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1921"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1920"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1921"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1920"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121513,10 +121996,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1923: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1923"
+$as_echo "$at_srcdir/ofproto-dpif.at:1922: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1922"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -121528,7 +122011,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:00:03,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.2,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:7743
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1923"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1922"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121537,15 +122020,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1934: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:1934"
+$as_echo "$at_srcdir/ofproto-dpif.at:1933: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:1933"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1934"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1933"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121554,15 +122037,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1941: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1941"
+$as_echo "$at_srcdir/ofproto-dpif.at:1940: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1940"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1941"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1940"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121574,19 +122057,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 00 04 88 47 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1946: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1945: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1946"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1945"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1946"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121595,19 +122078,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1947: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1946: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1947"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1946"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1947"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1946"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121616,10 +122099,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1949: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1949"
+$as_echo "$at_srcdir/ofproto-dpif.at:1948: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1948"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -121631,7 +122114,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:00:04,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.2,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:7743
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1948"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121640,15 +122123,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1960: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:1960"
+$as_echo "$at_srcdir/ofproto-dpif.at:1959: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:1959"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1960"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1959"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121657,15 +122140,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1967: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1967"
+$as_echo "$at_srcdir/ofproto-dpif.at:1966: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1966"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1967"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1966"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121677,19 +122160,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 00 05 88 48 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1972: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1971: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1972"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1971"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1972"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1971"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121698,19 +122181,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1973: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1972: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1973"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1972"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1973"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1972"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121719,10 +122202,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1975: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1975"
+$as_echo "$at_srcdir/ofproto-dpif.at:1974: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1974"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -121734,7 +122217,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.106,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:76db
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1975"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1974"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121743,15 +122226,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1986: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:1986"
+$as_echo "$at_srcdir/ofproto-dpif.at:1985: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:1985"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1986"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121760,15 +122243,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1993: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:1993"
+$as_echo "$at_srcdir/ofproto-dpif.at:1992: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:1992"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1993"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1992"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121780,19 +122263,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 00 06 88 47 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1998: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:1997: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1998"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:1997"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1998"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1997"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121801,19 +122284,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:1999: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:1998: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1999"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:1998"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1999"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:1998"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121822,10 +122305,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2001: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2001"
+$as_echo "$at_srcdir/ofproto-dpif.at:2000: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2000"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -121837,7 +122320,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:00:06,dl_dst=50:54:00:00:00:07,nw_src=192.168.255.255,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:7745
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2001"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2000"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121846,15 +122329,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2012: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2012"
+$as_echo "$at_srcdir/ofproto-dpif.at:2011: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2011"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2012"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2011"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121863,15 +122346,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2019: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2019"
+$as_echo "$at_srcdir/ofproto-dpif.at:2018: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2018"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2019"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121883,19 +122366,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 00 07 88 48 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2024: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2023: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2024"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2023"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2024"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2023"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121904,19 +122387,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2025: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2024: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2025"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2024"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2025"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2024"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121925,10 +122408,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2027: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2027"
+$as_echo "$at_srcdir/ofproto-dpif.at:2026: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2026"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -121940,7 +122423,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:00:07,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:7744
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121949,15 +122432,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2038: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2038"
+$as_echo "$at_srcdir/ofproto-dpif.at:2037: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2037"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2038"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2037"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121966,15 +122449,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2043: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2043"
+$as_echo "$at_srcdir/ofproto-dpif.at:2042: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2042"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2043"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -121986,19 +122469,19 @@
     ovs-appctl netdev-dummy/receive p1 'ff ff ff ff ff ff 60 66 66 66 00 08 88 47 00 01 41 20 00 01 08 00 06 04 00 02 60 66 66 66 00 08 c0 a8 00 01 ff ff ff ff ff ff ff ff ff ff'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2048: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2047: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2048"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2047"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2048"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2047"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122007,19 +122490,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2049: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2048: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2049"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2048"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2049"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2048"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122028,10 +122511,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2051: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2051"
+$as_echo "$at_srcdir/ofproto-dpif.at:2050: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2050"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -122043,7 +122526,7 @@
 arp,vlan_tci=0x0000,dl_src=60:66:66:66:00:08,dl_dst=ff:ff:ff:ff:ff:ff,arp_spa=192.168.0.1,arp_tpa=255.255.255.255,arp_op=2,arp_sha=60:66:66:66:00:08,arp_tha=ff:ff:ff:ff:ff:ff
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2051"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2050"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122052,15 +122535,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2062: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2062"
+$as_echo "$at_srcdir/ofproto-dpif.at:2061: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2061"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2062"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2061"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122069,15 +122552,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2069: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2069"
+$as_echo "$at_srcdir/ofproto-dpif.at:2068: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2068"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2069"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2068"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122089,19 +122572,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 00 09 88 48 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2074: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2073: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2074"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2073"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2073"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122110,19 +122593,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2075: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2074: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2075"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2074"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2075"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122131,10 +122614,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2077: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2077"
+$as_echo "$at_srcdir/ofproto-dpif.at:2076: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2076"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -122146,7 +122629,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:00:09,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=48,nw_ecn=0,nw_ttl=255,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:7744
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2077"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2076"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122155,15 +122638,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2088: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2088"
+$as_echo "$at_srcdir/ofproto-dpif.at:2087: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2087"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2088"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2087"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122172,15 +122655,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2095: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2095"
+$as_echo "$at_srcdir/ofproto-dpif.at:2094: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2094"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2095"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2094"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122192,19 +122675,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 00 0a 88 48 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2100: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2099: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2100"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2099"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2100"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122213,19 +122696,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2101: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2100: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2101"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2100"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2101"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122234,10 +122717,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2103: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2103"
+$as_echo "$at_srcdir/ofproto-dpif.at:2102: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2102"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -122249,7 +122732,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:00:0a,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=10.0.0.1,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:2dee
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2103"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122258,15 +122741,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2114: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2114"
+$as_echo "$at_srcdir/ofproto-dpif.at:2113: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2113"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2114"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2113"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122275,15 +122758,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2121: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2121"
+$as_echo "$at_srcdir/ofproto-dpif.at:2120: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2120"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2121"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2120"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122295,19 +122778,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 00 0b 88 48 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2126: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2125: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2126"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2125"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2126"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2125"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122316,19 +122799,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2127: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2126: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2127"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2126"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2127"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2126"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122337,10 +122820,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2129: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2129"
+$as_echo "$at_srcdir/ofproto-dpif.at:2128: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2128"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -122352,7 +122835,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:00:0b,dl_dst=50:54:00:00:00:07,nw_src=10.0.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:2ded
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2129"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2128"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122361,15 +122844,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2140: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2140"
+$as_echo "$at_srcdir/ofproto-dpif.at:2139: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2139"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2140"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2139"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122378,15 +122861,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2148: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2148"
+$as_echo "$at_srcdir/ofproto-dpif.at:2147: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2147"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2148"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122398,19 +122881,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 01 00 88 48 00 01 40 20 00 01 41 1f 45 00 00 2c 00 00 00 00 ff 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2153: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2152: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2153"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2152"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2153"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2152"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122419,19 +122902,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2154: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2153: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2154"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2153"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2154"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2153"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122440,10 +122923,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2156: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2156"
+$as_echo "$at_srcdir/ofproto-dpif.at:2155: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2155"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -122455,7 +122938,7 @@
 mplsm,vlan_tci=0x0000,dl_src=60:66:66:66:01:00,dl_dst=50:54:00:00:00:07,mpls_label=20,mpls_tc=0,mpls_ttl=31,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2156"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2155"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122464,15 +122947,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2167: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2167"
+$as_echo "$at_srcdir/ofproto-dpif.at:2166: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2166"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2167"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2166"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122481,15 +122964,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2175: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2175"
+$as_echo "$at_srcdir/ofproto-dpif.at:2174: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2174"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2175"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122501,19 +122984,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 01 01 88 47 00 01 40 20 00 01 41 1f 45 00 00 2c 00 00 00 00 ff 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2180: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2179: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2180"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2179"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2180"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122522,19 +123005,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2181: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2180: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2181"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2180"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2181"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2180"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122543,10 +123026,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2183: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2183"
+$as_echo "$at_srcdir/ofproto-dpif.at:2182: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2182"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -122558,7 +123041,7 @@
 mpls,vlan_tci=0x0000,dl_src=60:66:66:66:01:01,dl_dst=50:54:00:00:00:07,mpls_label=20,mpls_tc=0,mpls_ttl=30,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2183"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2182"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122567,15 +123050,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2194: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2194"
+$as_echo "$at_srcdir/ofproto-dpif.at:2193: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2193"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2194"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2193"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122584,15 +123067,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2202: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2202"
+$as_echo "$at_srcdir/ofproto-dpif.at:2201: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2201"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2202"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122604,19 +123087,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 01 02 88 48 00 01 40 20 00 01 41 1f 45 00 00 2c 00 00 00 00 ff 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2207: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2206: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2207"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2206"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2207"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122625,19 +123108,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2208: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2207: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2208"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2207"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2208"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2207"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122646,10 +123129,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2210: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2210"
+$as_echo "$at_srcdir/ofproto-dpif.at:2209: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2209"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -122661,7 +123144,7 @@
 mplsm,vlan_tci=0x0000,dl_src=60:66:66:66:01:02,dl_dst=50:54:00:00:00:07,mpls_label=20,mpls_tc=3,mpls_ttl=31,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2210"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2209"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122670,15 +123153,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2221: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2221"
+$as_echo "$at_srcdir/ofproto-dpif.at:2220: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2220"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2221"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2220"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122687,15 +123170,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2229: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2229"
+$as_echo "$at_srcdir/ofproto-dpif.at:2228: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2228"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2229"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2228"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122707,19 +123190,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 02 00 88 47 00 01 40 20 00 01 41 1f 45 00 00 2c 00 00 00 00 ff 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2234: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2233: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2234"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2233"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2234"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122728,19 +123211,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2235: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2234: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2235"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2234"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2235"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122749,10 +123232,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2237: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2237"
+$as_echo "$at_srcdir/ofproto-dpif.at:2236: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2236"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -122764,7 +123247,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:02:00,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:7744
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2237"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122773,15 +123256,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2248: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2248"
+$as_echo "$at_srcdir/ofproto-dpif.at:2247: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2247"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2248"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2247"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122790,15 +123273,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2256: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2256"
+$as_echo "$at_srcdir/ofproto-dpif.at:2255: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2255"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2256"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2255"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122811,19 +123294,19 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2262: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2261: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2262"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2261"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2262"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2261"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122832,19 +123315,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2263: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2262: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2263"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2262"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2262"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122853,10 +123336,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2265: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2265"
+$as_echo "$at_srcdir/ofproto-dpif.at:2264: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2264"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -122868,7 +123351,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:02:01,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=254,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:7744
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2265"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2264"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122877,15 +123360,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2276: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2276"
+$as_echo "$at_srcdir/ofproto-dpif.at:2275: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2275"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2276"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122894,15 +123377,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2284: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2284"
+$as_echo "$at_srcdir/ofproto-dpif.at:2283: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2283"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2284"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2283"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122914,19 +123397,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 02 10 88 47 00 01 40 20 00 01 41 1f 45 00 00 2c 00 00 00 00 ff 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2289: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2288: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2289"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2288"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2289"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2288"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122935,19 +123418,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2290: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2289: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2290"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2289"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2290"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2289"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122956,10 +123439,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2292: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2292"
+$as_echo "$at_srcdir/ofproto-dpif.at:2291: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2291"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -122971,7 +123454,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:02:10,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=254,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:7744
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2292"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2291"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122980,15 +123463,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2303: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2303"
+$as_echo "$at_srcdir/ofproto-dpif.at:2302: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2302"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2303"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2302"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -122997,15 +123480,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2312: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2312"
+$as_echo "$at_srcdir/ofproto-dpif.at:2311: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2311"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2312"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123017,19 +123500,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 03 00 88 47 00 01 40 20 00 01 40 1f 00 01 41 1e 45 00 00 2c 00 00 00 00 ff 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2317: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2316: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2317"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2316"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2317"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2316"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123038,19 +123521,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2318: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2317: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2318"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2317"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2318"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2317"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123059,10 +123542,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2320: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2320"
+$as_echo "$at_srcdir/ofproto-dpif.at:2319: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2319"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -123074,7 +123557,7 @@
 mplsm,vlan_tci=0x0000,dl_src=60:66:66:66:03:00,dl_dst=50:54:00:00:00:07,mpls_label=20,mpls_tc=0,mpls_ttl=30,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2320"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2319"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123083,15 +123566,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2331: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2331"
+$as_echo "$at_srcdir/ofproto-dpif.at:2330: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2330"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2331"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2330"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123100,15 +123583,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2340: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2340"
+$as_echo "$at_srcdir/ofproto-dpif.at:2339: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2339"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2340"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2339"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123120,19 +123603,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 03 01 88 48 00 01 40 20 00 01 40 1f 00 01 41 1e 45 00 00 2c 00 00 00 00 ff 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2345: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2344: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2345"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2344"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2345"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2344"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123141,19 +123624,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2346: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2345: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2346"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2345"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2346"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2345"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123162,10 +123645,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2348: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2348"
+$as_echo "$at_srcdir/ofproto-dpif.at:2347: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2347"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -123177,7 +123660,7 @@
 mpls,vlan_tci=0x0000,dl_src=60:66:66:66:03:01,dl_dst=50:54:00:00:00:07,mpls_label=20,mpls_tc=0,mpls_ttl=29,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2348"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2347"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123186,15 +123669,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2359: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2359"
+$as_echo "$at_srcdir/ofproto-dpif.at:2358: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2358"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2359"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2358"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123203,15 +123686,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2368: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2368"
+$as_echo "$at_srcdir/ofproto-dpif.at:2367: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2367"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2368"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2367"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123223,19 +123706,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 03 10 88 47 00 01 40 20 00 01 40 1f 00 01 41 1e 45 00 00 2c 00 00 00 00 ff 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2373: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2372: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2373"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2372"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2373"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2372"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123244,19 +123727,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2374: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2373: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2374"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2373"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2374"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2373"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123265,10 +123748,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2376: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2376"
+$as_echo "$at_srcdir/ofproto-dpif.at:2375: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2375"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -123280,7 +123763,7 @@
 mplsm,vlan_tci=0x0000,dl_src=60:66:66:66:03:10,dl_dst=50:54:00:00:00:07,mpls_label=20,mpls_tc=0,mpls_ttl=29,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2376"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2375"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123289,15 +123772,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2387: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2387"
+$as_echo "$at_srcdir/ofproto-dpif.at:2386: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2386"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2386"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123306,15 +123789,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2394: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2394"
+$as_echo "$at_srcdir/ofproto-dpif.at:2393: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2393"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2394"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2393"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123326,19 +123809,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 04 00 88 48 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2399: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2398: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2399"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2398"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2399"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2398"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123347,19 +123830,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2400: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2399: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2400"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2399"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2400"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2399"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123368,10 +123851,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2402: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2402"
+$as_echo "$at_srcdir/ofproto-dpif.at:2401: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2401"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -123383,7 +123866,7 @@
 mpls,vlan_tci=0x0000,dl_src=60:66:66:66:04:00,dl_dst=50:54:00:00:00:07,mpls_label=0,mpls_tc=0,mpls_ttl=255,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2402"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2401"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123392,15 +123875,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2413: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2413"
+$as_echo "$at_srcdir/ofproto-dpif.at:2412: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2412"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2413"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2412"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123409,15 +123892,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2420: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2420"
+$as_echo "$at_srcdir/ofproto-dpif.at:2419: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2419"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2420"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2419"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123429,19 +123912,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 04 01 88 47 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2425: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2424: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2425"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2424"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2425"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2424"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123450,19 +123933,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2426: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2425: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2426"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2425"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2426"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2425"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123471,10 +123954,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2428: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2428"
+$as_echo "$at_srcdir/ofproto-dpif.at:2427: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2427"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -123486,7 +123969,7 @@
 mplsm,vlan_tci=0x0000,dl_src=60:66:66:66:04:01,dl_dst=50:54:00:00:00:07,mpls_label=0,mpls_tc=0,mpls_ttl=254,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2428"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123495,15 +123978,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2439: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2439"
+$as_echo "$at_srcdir/ofproto-dpif.at:2438: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2438"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2439"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2438"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123512,15 +123995,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2446: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2446"
+$as_echo "$at_srcdir/ofproto-dpif.at:2445: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2445"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2446"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2445"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123532,19 +124015,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 04 10 88 48 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2451: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2450: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2451"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2450"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2451"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2450"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123553,19 +124036,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2452: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2451: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2452"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2451"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2452"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2451"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123574,10 +124057,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2454: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/'  ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2454"
+$as_echo "$at_srcdir/ofproto-dpif.at:2453: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/'  ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2453"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/'  ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -123589,7 +124072,7 @@
 mplsm,vlan_tci=0x0000,dl_src=60:66:66:66:04:10,dl_dst=50:54:00:00:00:07,mpls_label=0,mpls_tc=0,mpls_ttl=253,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2454"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2453"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123598,15 +124081,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2465: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2465"
+$as_echo "$at_srcdir/ofproto-dpif.at:2464: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2464"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2465"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2464"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123615,15 +124098,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2472: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2472"
+$as_echo "$at_srcdir/ofproto-dpif.at:2471: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2471"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2472"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2471"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123636,19 +124119,19 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2478: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2477: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2478"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2477"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2478"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2477"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123657,19 +124140,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2479: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2478: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2479"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2478"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2479"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2478"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123678,10 +124161,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2481: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2481"
+$as_echo "$at_srcdir/ofproto-dpif.at:2480: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2480"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -123693,7 +124176,7 @@
 mpls,vlan_tci=0x0000,dl_src=60:66:66:66:05:00,dl_dst=50:54:00:00:00:07,mpls_label=20,mpls_tc=0,mpls_ttl=32,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2481"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2480"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123702,15 +124185,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2492: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2492"
+$as_echo "$at_srcdir/ofproto-dpif.at:2491: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2491"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2492"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2491"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123719,15 +124202,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2499: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2499"
+$as_echo "$at_srcdir/ofproto-dpif.at:2498: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2498"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2499"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2498"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123739,19 +124222,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 60 66 66 66 05 01 88 48 00 01 41 20 45 00 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2504: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2503: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2504"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2503"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2504"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2503"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123760,19 +124243,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2505: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2504: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2505"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2504"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2505"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2504"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123781,10 +124264,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2507: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2507"
+$as_echo "$at_srcdir/ofproto-dpif.at:2506: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2506"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -123796,7 +124279,7 @@
 mplsm,vlan_tci=0x0000,dl_src=60:66:66:66:05:01,dl_dst=50:54:00:00:00:07,mpls_label=20,mpls_tc=0,mpls_ttl=31,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2507"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2506"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123805,15 +124288,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2518: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2518"
+$as_echo "$at_srcdir/ofproto-dpif.at:2517: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2517"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2518"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2517"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123822,15 +124305,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2525: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2525"
+$as_echo "$at_srcdir/ofproto-dpif.at:2524: ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2524"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2525"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2524"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123843,19 +124326,19 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2531: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2530: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2531"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2530"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2531"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2530"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123864,19 +124347,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2532: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2531: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2532"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2531"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2532"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2531"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123885,10 +124368,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2534: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2534"
+$as_echo "$at_srcdir/ofproto-dpif.at:2533: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2533"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -123900,7 +124383,7 @@
 mpls,vlan_tci=0x0000,dl_src=60:66:66:66:05:10,dl_dst=50:54:00:00:00:07,mpls_label=20,mpls_tc=0,mpls_ttl=31,mpls_bos=1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2534"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2533"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123909,15 +124392,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2545: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:2545"
+$as_echo "$at_srcdir/ofproto-dpif.at:2544: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:2544"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2545"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2544"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123925,10 +124408,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2546: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2546"
+$as_echo "$at_srcdir/ofproto-dpif.at:2545: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2545"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -123975,7 +124458,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2546"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2545"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -123984,15 +124467,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2590: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:2590"
+$as_echo "$at_srcdir/ofproto-dpif.at:2589: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:2589"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2590"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2589"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124000,15 +124483,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2590: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2590"
+$as_echo "$at_srcdir/ofproto-dpif.at:2589: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2589"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2590"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2589"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124016,15 +124499,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2590: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2590"
+$as_echo "$at_srcdir/ofproto-dpif.at:2589: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2589"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2590"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2589"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124035,13 +124518,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_833
-#AT_START_834
-at_fn_group_banner 834 'ofproto-dpif.at:2593' \
+#AT_STOP_835
+#AT_START_836
+at_fn_group_banner 836 'ofproto-dpif.at:2592' \
   "ofproto-dpif - MPLS handling with goto_table" "   " 52
 at_xfail=no
 (
-  $as_echo "834. $at_setup_line: testing $at_desc ..."
+  $as_echo "836. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -124051,29 +124534,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2594: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2594"
+$as_echo "$at_srcdir/ofproto-dpif.at:2593: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2593"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2594"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2593"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2594: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2594"
+$as_echo "$at_srcdir/ofproto-dpif.at:2593: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2593"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2594"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2593"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -124083,49 +124566,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2594: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2593: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2594"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2593"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2594"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2593"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2594: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:2594"
+$as_echo "$at_srcdir/ofproto-dpif.at:2593: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:2593"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2594"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2593"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2594: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:2594"
+$as_echo "$at_srcdir/ofproto-dpif.at:2593: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:2593"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2594"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2593"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -124137,14 +124620,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2594: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2593: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2594"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2593"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -124152,12 +124635,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2594"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2593"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -124166,17 +124649,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2594: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:2593: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2594"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2593"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2594"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2593"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -124196,15 +124679,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2604: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:2604"
+$as_echo "$at_srcdir/ofproto-dpif.at:2603: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:2603"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2604"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2603"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124214,15 +124697,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2612: ovs-ofctl -O OpenFlow12 monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2612"
+$as_echo "$at_srcdir/ofproto-dpif.at:2611: ovs-ofctl -O OpenFlow12 monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2611"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2612"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2611"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124234,19 +124717,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 01 60 66 66 66 00 08 88 48 00 01 41 20 45 20 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2617: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2616: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2617"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2616"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2617"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2616"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124255,19 +124738,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2618: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2617: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2618"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2617"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2618"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2617"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124276,10 +124759,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2620: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2620"
+$as_echo "$at_srcdir/ofproto-dpif.at:2619: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2619"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -124291,7 +124774,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:00:08,dl_dst=50:54:00:00:00:01,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=32,nw_ecn=0,nw_ttl=255,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:7744
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2620"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2619"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124300,15 +124783,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2631: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:2631"
+$as_echo "$at_srcdir/ofproto-dpif.at:2630: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:2630"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2631"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2630"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124316,10 +124799,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2632: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2632"
+$as_echo "$at_srcdir/ofproto-dpif.at:2631: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2631"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -124328,7 +124811,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2632"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2631"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124337,15 +124820,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2638: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:2638"
+$as_echo "$at_srcdir/ofproto-dpif.at:2637: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:2637"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2638"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2637"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124353,15 +124836,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2638: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2638"
+$as_echo "$at_srcdir/ofproto-dpif.at:2637: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2637"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2638"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2637"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124369,15 +124852,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2638: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2638"
+$as_echo "$at_srcdir/ofproto-dpif.at:2637: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2637"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2638"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2637"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124388,13 +124871,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_834
-#AT_START_835
-at_fn_group_banner 835 'ofproto-dpif.at:2641' \
+#AT_STOP_836
+#AT_START_837
+at_fn_group_banner 837 'ofproto-dpif.at:2640' \
   "ofproto-dpif - MPLS handling with write_actions" "" 52
 at_xfail=no
 (
-  $as_echo "835. $at_setup_line: testing $at_desc ..."
+  $as_echo "837. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -124404,29 +124887,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2642: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2642"
+$as_echo "$at_srcdir/ofproto-dpif.at:2641: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2641"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2642"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2641"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2642: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2642"
+$as_echo "$at_srcdir/ofproto-dpif.at:2641: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2641"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2642"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2641"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -124436,49 +124919,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2642: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2641: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2642"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2641"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2642"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2641"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2642: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:2642"
+$as_echo "$at_srcdir/ofproto-dpif.at:2641: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:2641"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2642"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2641"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2642: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:2642"
+$as_echo "$at_srcdir/ofproto-dpif.at:2641: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:2641"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2642"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2641"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -124490,14 +124973,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2642: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2641: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2642"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2641"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -124505,12 +124988,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2642"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2641"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -124519,17 +125002,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2642: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:2641: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2642"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2641"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2642"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2641"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -124548,15 +125031,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2654: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:2654"
+$as_echo "$at_srcdir/ofproto-dpif.at:2653: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:2653"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2654"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2653"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124565,15 +125048,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2661: ovs-ofctl -O OpenFlow12 monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2661"
+$as_echo "$at_srcdir/ofproto-dpif.at:2660: ovs-ofctl -O OpenFlow12 monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2660"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 monitor br0 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2661"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2660"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124585,19 +125068,19 @@
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 01 60 66 66 66 00 08 88 48 00 01 41 20 45 20 00 2c 00 00 00 00 ff 06 3a 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2666: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2665: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2666"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2665"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2666"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2665"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124606,19 +125089,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2667: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:2666: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2667"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2666"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2667"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2666"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124627,10 +125110,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2669: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2669"
+$as_echo "$at_srcdir/ofproto-dpif.at:2668: sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2668"
 ( $at_check_trace; sed 's/metadata=0x[0-9a-f]*/metadata=0x0/' ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -124642,7 +125125,7 @@
 tcp,vlan_tci=0x0000,dl_src=60:66:66:66:00:08,dl_dst=50:54:00:00:00:01,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=32,nw_ecn=0,nw_ttl=254,tp_src=80,tp_dst=0,tcp_flags=0 tcp_csum:7744
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2669"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2668"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124651,15 +125134,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2680: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:2680"
+$as_echo "$at_srcdir/ofproto-dpif.at:2679: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:2679"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2680"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2679"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124667,10 +125150,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2681: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2681"
+$as_echo "$at_srcdir/ofproto-dpif.at:2680: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2680"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -124678,7 +125161,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2681"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2680"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124687,15 +125170,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2686: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:2686"
+$as_echo "$at_srcdir/ofproto-dpif.at:2685: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:2685"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2686"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2685"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124703,15 +125186,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2686: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2686"
+$as_echo "$at_srcdir/ofproto-dpif.at:2685: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2685"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2686"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2685"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124719,15 +125202,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2686: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2686"
+$as_echo "$at_srcdir/ofproto-dpif.at:2685: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2685"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2686"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2685"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124738,13 +125221,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_835
-#AT_START_836
-at_fn_group_banner 836 'ofproto-dpif.at:2689' \
+#AT_STOP_837
+#AT_START_838
+at_fn_group_banner 838 'ofproto-dpif.at:2688' \
   "ofproto-dpif - table-miss flow (OpenFlow 1.0)" "  " 52
 at_xfail=no
 (
-  $as_echo "836. $at_setup_line: testing $at_desc ..."
+  $as_echo "838. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -124754,29 +125237,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2690: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2690"
+$as_echo "$at_srcdir/ofproto-dpif.at:2689: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2689"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2689"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2690: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2690"
+$as_echo "$at_srcdir/ofproto-dpif.at:2689: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2689"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2689"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -124786,49 +125269,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2690: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2689: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2690"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2689"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2689"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2690: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:2690"
+$as_echo "$at_srcdir/ofproto-dpif.at:2689: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:2689"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2689"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2690: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:2690"
+$as_echo "$at_srcdir/ofproto-dpif.at:2689: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:2689"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2689"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -124840,14 +125323,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2690: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2689: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2690"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2689"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -124855,12 +125338,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2689"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -124869,17 +125352,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2690: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:2689: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2690"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2689"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2689"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -124895,15 +125378,15 @@
 
 # A table-miss flow has priority 0 and no match
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2697: ovs-ofctl --protocols=OpenFlow10 add-flow br0 'priority=0 actions=output:CONTROLLER'"
-at_fn_check_prepare_trace "ofproto-dpif.at:2697"
+$as_echo "$at_srcdir/ofproto-dpif.at:2696: ovs-ofctl --protocols=OpenFlow10 add-flow br0 'priority=0 actions=output:CONTROLLER'"
+at_fn_check_prepare_trace "ofproto-dpif.at:2696"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow10 add-flow br0 'priority=0 actions=output:CONTROLLER'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2697"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2696"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124912,15 +125395,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2700: ovs-ofctl monitor -P openflow10 --protocols=OpenFlow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2700"
+$as_echo "$at_srcdir/ofproto-dpif.at:2699: ovs-ofctl monitor -P openflow10 --protocols=OpenFlow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2699"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 --protocols=OpenFlow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2700"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2699"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124932,19 +125415,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10),tcp_flags(0x002)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2705: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2704: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2705"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2704"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2705"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2704"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124954,10 +125437,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2708: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2708"
+$as_echo "$at_srcdir/ofproto-dpif.at:2707: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2707"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -124969,7 +125452,7 @@
 tcp,vlan_tci=0x0000,dl_src=10:11:11:11:11:11,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=10,tcp_flags=syn tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2708"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2707"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124978,15 +125461,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2719: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:2719"
+$as_echo "$at_srcdir/ofproto-dpif.at:2718: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:2718"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2719"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2718"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -124994,10 +125477,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2720: ovs-ofctl --protocols=OpenFlow10 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2720"
+$as_echo "$at_srcdir/ofproto-dpif.at:2719: ovs-ofctl --protocols=OpenFlow10 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2719"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow10 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -125005,7 +125488,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2720"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2719"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125014,15 +125497,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2725: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:2725"
+$as_echo "$at_srcdir/ofproto-dpif.at:2724: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:2724"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2725"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2724"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125030,15 +125513,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2725: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2725"
+$as_echo "$at_srcdir/ofproto-dpif.at:2724: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2724"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2725"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2724"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125046,15 +125529,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2725: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2725"
+$as_echo "$at_srcdir/ofproto-dpif.at:2724: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2724"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2725"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2724"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125065,13 +125548,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_836
-#AT_START_837
-at_fn_group_banner 837 'ofproto-dpif.at:2729' \
+#AT_STOP_838
+#AT_START_839
+at_fn_group_banner 839 'ofproto-dpif.at:2728' \
   "ofproto-dpif - table-miss flow (OpenFlow 1.3)" "  " 52
 at_xfail=no
 (
-  $as_echo "837. $at_setup_line: testing $at_desc ..."
+  $as_echo "839. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -125081,29 +125564,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2730: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2730"
+$as_echo "$at_srcdir/ofproto-dpif.at:2729: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2729"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2729"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2730: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2730"
+$as_echo "$at_srcdir/ofproto-dpif.at:2729: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2729"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2729"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -125113,49 +125596,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2730: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2729: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2730"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2729"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2729"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2730: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:2730"
+$as_echo "$at_srcdir/ofproto-dpif.at:2729: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:2729"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2729"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2730: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:2730"
+$as_echo "$at_srcdir/ofproto-dpif.at:2729: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:2729"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2729"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -125167,14 +125650,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2730: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2729: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2730"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2729"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -125182,12 +125665,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2729"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -125196,17 +125679,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2730: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:2729: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2730"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2729"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2729"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -125222,15 +125705,15 @@
 
 # A table-miss flow has priority 0 and no match
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2737: ovs-ofctl --protocols=OpenFlow13 add-flow br0 'priority=0 actions=output:CONTROLLER'"
-at_fn_check_prepare_trace "ofproto-dpif.at:2737"
+$as_echo "$at_srcdir/ofproto-dpif.at:2736: ovs-ofctl --protocols=OpenFlow13 add-flow br0 'priority=0 actions=output:CONTROLLER'"
+at_fn_check_prepare_trace "ofproto-dpif.at:2736"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow13 add-flow br0 'priority=0 actions=output:CONTROLLER'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2737"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2736"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125239,15 +125722,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2740: ovs-ofctl monitor -P openflow10 --protocols=OpenFlow13 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2740"
+$as_echo "$at_srcdir/ofproto-dpif.at:2739: ovs-ofctl monitor -P openflow10 --protocols=OpenFlow13 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2739"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 --protocols=OpenFlow13 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2740"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2739"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125259,19 +125742,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10),tcp_flags(0x002)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2745: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2744: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2745"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2744"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2745"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2744"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125281,15 +125764,15 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2748: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2748"
+$as_echo "$at_srcdir/ofproto-dpif.at:2747: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2747"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2748"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2747"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125298,10 +125781,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2750: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2750"
+$as_echo "$at_srcdir/ofproto-dpif.at:2749: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2749"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -125313,7 +125796,7 @@
 tcp,vlan_tci=0x0000,dl_src=10:11:11:11:11:11,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=10,tcp_flags=syn tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2750"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2749"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125322,15 +125805,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2761: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:2761"
+$as_echo "$at_srcdir/ofproto-dpif.at:2760: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:2760"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2760"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125338,10 +125821,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2762: ovs-ofctl --protocols=OpenFlow13 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2762"
+$as_echo "$at_srcdir/ofproto-dpif.at:2761: ovs-ofctl --protocols=OpenFlow13 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2761"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow13 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -125349,7 +125832,7 @@
 OFPST_FLOW reply (OF1.3):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2762"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2761"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125358,15 +125841,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2767: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:2767"
+$as_echo "$at_srcdir/ofproto-dpif.at:2766: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:2766"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2767"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2766"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125374,15 +125857,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2767: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2767"
+$as_echo "$at_srcdir/ofproto-dpif.at:2766: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2766"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2767"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2766"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125390,15 +125873,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2767: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2767"
+$as_echo "$at_srcdir/ofproto-dpif.at:2766: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2766"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2767"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2766"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125409,13 +125892,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_837
-#AT_START_838
-at_fn_group_banner 838 'ofproto-dpif.at:2770' \
+#AT_STOP_839
+#AT_START_840
+at_fn_group_banner 840 'ofproto-dpif.at:2769' \
   "ofproto-dpif - table-miss flow with async config (OpenFlow 1.3)" "" 52
 at_xfail=no
 (
-  $as_echo "838. $at_setup_line: testing $at_desc ..."
+  $as_echo "840. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -125425,29 +125908,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2771: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2771"
+$as_echo "$at_srcdir/ofproto-dpif.at:2770: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2770"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2771"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2770"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2771: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2771"
+$as_echo "$at_srcdir/ofproto-dpif.at:2770: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2770"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2771"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2770"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -125457,49 +125940,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2771: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2770: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2771"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2770"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2771"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2770"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2771: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:2771"
+$as_echo "$at_srcdir/ofproto-dpif.at:2770: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:2770"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2771"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2770"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2771: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:2771"
+$as_echo "$at_srcdir/ofproto-dpif.at:2770: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:2770"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2771"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2770"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -125511,14 +125994,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2771: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2770: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2771"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2770"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -125526,12 +126009,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2771"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2770"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -125540,17 +126023,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2771: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:2770: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2771"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2770"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2771"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2770"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -125568,15 +126051,15 @@
 
 # A table-miss flow has priority 0 and no match
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2780: ovs-ofctl --protocols=OpenFlow13 add-flow br0 'priority=0 actions=output:CONTROLLER'"
-at_fn_check_prepare_trace "ofproto-dpif.at:2780"
+$as_echo "$at_srcdir/ofproto-dpif.at:2779: ovs-ofctl --protocols=OpenFlow13 add-flow br0 'priority=0 actions=output:CONTROLLER'"
+at_fn_check_prepare_trace "ofproto-dpif.at:2779"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow13 add-flow br0 'priority=0 actions=output:CONTROLLER'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2780"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2779"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125585,15 +126068,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2783: ovs-ofctl monitor -P openflow10 --protocols=OpenFlow13 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2783"
+$as_echo "$at_srcdir/ofproto-dpif.at:2782: ovs-ofctl monitor -P openflow10 --protocols=OpenFlow13 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2782"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 --protocols=OpenFlow13 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2783"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2782"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125615,19 +126098,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10),tcp_flags(0x002)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2798: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2797: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2798"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2797"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2798"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125637,15 +126120,15 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2801: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:2801"
+$as_echo "$at_srcdir/ofproto-dpif.at:2800: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:2800"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2801"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2800"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125653,10 +126136,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2802: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2802"
+$as_echo "$at_srcdir/ofproto-dpif.at:2801: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2801"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -125680,7 +126163,7 @@
 tcp,vlan_tci=0x0000,dl_src=10:11:11:11:11:11,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=10,tcp_flags=syn tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2802"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2801"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125689,15 +126172,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2827: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2827"
+$as_echo "$at_srcdir/ofproto-dpif.at:2826: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2826"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2827"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2826"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125706,10 +126189,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2829: ovs-ofctl --protocols=OpenFlow13 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2829"
+$as_echo "$at_srcdir/ofproto-dpif.at:2828: ovs-ofctl --protocols=OpenFlow13 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2828"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow13 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -125717,7 +126200,7 @@
 OFPST_FLOW reply (OF1.3):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2829"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2828"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125726,15 +126209,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2834: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:2834"
+$as_echo "$at_srcdir/ofproto-dpif.at:2833: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:2833"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2834"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2833"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125742,15 +126225,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2834: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2834"
+$as_echo "$at_srcdir/ofproto-dpif.at:2833: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2833"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2834"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2833"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125758,15 +126241,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2834: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2834"
+$as_echo "$at_srcdir/ofproto-dpif.at:2833: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2833"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2834"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2833"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125777,13 +126260,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_838
-#AT_START_839
-at_fn_group_banner 839 'ofproto-dpif.at:2838' \
+#AT_STOP_840
+#AT_START_841
+at_fn_group_banner 841 'ofproto-dpif.at:2837' \
   "ofproto-dpif - table-miss flow (OpenFlow 1.4)" "  " 52
 at_xfail=no
 (
-  $as_echo "839. $at_setup_line: testing $at_desc ..."
+  $as_echo "841. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -125793,29 +126276,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2839: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2839"
+$as_echo "$at_srcdir/ofproto-dpif.at:2838: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2838"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2838"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2839: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2839"
+$as_echo "$at_srcdir/ofproto-dpif.at:2838: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2838"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2838"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -125825,49 +126308,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2839: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2838: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2839"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2838"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2838"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2839: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:2839"
+$as_echo "$at_srcdir/ofproto-dpif.at:2838: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:2838"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2838"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2839: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:2839"
+$as_echo "$at_srcdir/ofproto-dpif.at:2838: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:2838"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2838"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -125879,14 +126362,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2839: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2838: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2839"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2838"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -125894,12 +126377,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2838"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -125908,17 +126391,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2839: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:2838: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2839"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2838"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2838"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -125934,15 +126417,15 @@
 
 # A table-miss flow has priority 0 and no match
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2846: ovs-ofctl --protocols=OpenFlow14 add-flow br0 'priority=0 actions=output:CONTROLLER'"
-at_fn_check_prepare_trace "ofproto-dpif.at:2846"
+$as_echo "$at_srcdir/ofproto-dpif.at:2845: ovs-ofctl --protocols=OpenFlow14 add-flow br0 'priority=0 actions=output:CONTROLLER'"
+at_fn_check_prepare_trace "ofproto-dpif.at:2845"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow14 add-flow br0 'priority=0 actions=output:CONTROLLER'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125951,15 +126434,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2849: ovs-ofctl monitor -P openflow10 --protocols=OpenFlow14 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2849"
+$as_echo "$at_srcdir/ofproto-dpif.at:2848: ovs-ofctl monitor -P openflow10 --protocols=OpenFlow14 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2848"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 --protocols=OpenFlow14 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2849"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2848"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125971,19 +126454,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10),tcp_flags(0x002)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2854: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2853: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2854"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2853"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2854"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2853"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -125993,15 +126476,15 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2857: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:2857"
+$as_echo "$at_srcdir/ofproto-dpif.at:2856: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:2856"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2857"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2856"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126009,10 +126492,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2858: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2858"
+$as_echo "$at_srcdir/ofproto-dpif.at:2857: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2857"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -126024,7 +126507,7 @@
 tcp,vlan_tci=0x0000,dl_src=10:11:11:11:11:11,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=10,tcp_flags=syn tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2858"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2857"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126033,15 +126516,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2869: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2869"
+$as_echo "$at_srcdir/ofproto-dpif.at:2868: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2868"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2869"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2868"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126050,10 +126533,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2871: ovs-ofctl --protocols=OpenFlow14 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2871"
+$as_echo "$at_srcdir/ofproto-dpif.at:2870: ovs-ofctl --protocols=OpenFlow14 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2870"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow14 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -126061,7 +126544,7 @@
 OFPST_FLOW reply (OF1.4):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2871"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2870"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126070,15 +126553,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2876: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:2876"
+$as_echo "$at_srcdir/ofproto-dpif.at:2875: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:2875"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2876"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2875"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126086,15 +126569,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2876: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2876"
+$as_echo "$at_srcdir/ofproto-dpif.at:2875: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2875"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2876"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2875"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126102,15 +126585,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2876: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2876"
+$as_echo "$at_srcdir/ofproto-dpif.at:2875: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2875"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2876"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2875"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126121,13 +126604,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_839
-#AT_START_840
-at_fn_group_banner 840 'ofproto-dpif.at:2880' \
+#AT_STOP_841
+#AT_START_842
+at_fn_group_banner 842 'ofproto-dpif.at:2879' \
   "ofproto-dpif - packet-in reasons (Openflow 1.3)" "" 52
 at_xfail=no
 (
-  $as_echo "840. $at_setup_line: testing $at_desc ..."
+  $as_echo "842. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -126137,29 +126620,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2881: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2881"
+$as_echo "$at_srcdir/ofproto-dpif.at:2880: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2880"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2881"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2880"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2881: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2881"
+$as_echo "$at_srcdir/ofproto-dpif.at:2880: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2880"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2881"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2880"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -126169,49 +126652,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2881: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2880: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2881"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2880"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2881"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2880"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2881: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:2881"
+$as_echo "$at_srcdir/ofproto-dpif.at:2880: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:2880"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2881"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2880"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2881: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:2881"
+$as_echo "$at_srcdir/ofproto-dpif.at:2880: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:2880"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2881"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2880"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -126223,14 +126706,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2881: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2880: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2881"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2880"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -126238,12 +126721,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2881"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2880"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -126252,17 +126735,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2881: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:2880: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2881"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2880"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2881"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2880"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -126283,15 +126766,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2892: ovs-ofctl --protocols=OpenFlow13 add-group br0 'group_id=1234,type=all,bucket=output:10,bucket=output:CONTROLLER'"
-at_fn_check_prepare_trace "ofproto-dpif.at:2892"
+$as_echo "$at_srcdir/ofproto-dpif.at:2891: ovs-ofctl --protocols=OpenFlow13 add-group br0 'group_id=1234,type=all,bucket=output:10,bucket=output:CONTROLLER'"
+at_fn_check_prepare_trace "ofproto-dpif.at:2891"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow13 add-group br0 'group_id=1234,type=all,bucket=output:10,bucket=output:CONTROLLER'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2892"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2891"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126299,15 +126782,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2893: ovs-ofctl --protocols=OpenFlow13 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:2893"
+$as_echo "$at_srcdir/ofproto-dpif.at:2892: ovs-ofctl --protocols=OpenFlow13 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:2892"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow13 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2893"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2892"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126316,15 +126799,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2896: ovs-ofctl monitor -P openflow10 --protocols=OpenFlow13 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2896"
+$as_echo "$at_srcdir/ofproto-dpif.at:2895: ovs-ofctl monitor -P openflow10 --protocols=OpenFlow13 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2895"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 --protocols=OpenFlow13 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2896"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2895"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126336,19 +126819,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10),tcp_flags(0x002)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2901: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2900: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2901"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2900"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2901"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2900"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126358,15 +126841,15 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2904: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2904"
+$as_echo "$at_srcdir/ofproto-dpif.at:2903: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2903"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2904"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2903"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126375,10 +126858,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2906: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2906"
+$as_echo "$at_srcdir/ofproto-dpif.at:2905: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2905"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -126402,7 +126885,7 @@
 tcp,vlan_tci=0x0000,dl_src=10:11:11:11:11:11,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=10,tcp_flags=syn tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2906"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2905"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126411,15 +126894,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2935: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2935"
+$as_echo "$at_srcdir/ofproto-dpif.at:2934: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2934"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2935"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2934"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126428,10 +126911,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2937: ovs-ofctl --protocols=OpenFlow13 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2937"
+$as_echo "$at_srcdir/ofproto-dpif.at:2936: ovs-ofctl --protocols=OpenFlow13 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:2936"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow13 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -126441,7 +126924,7 @@
 OFPST_FLOW reply (OF1.3):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2937"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2936"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126450,15 +126933,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2944: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:2944"
+$as_echo "$at_srcdir/ofproto-dpif.at:2943: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:2943"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2944"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2943"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126466,15 +126949,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2944: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2944"
+$as_echo "$at_srcdir/ofproto-dpif.at:2943: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2943"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2944"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2943"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126482,15 +126965,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2944: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:2944"
+$as_echo "$at_srcdir/ofproto-dpif.at:2943: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:2943"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2944"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2943"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126501,13 +126984,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_840
-#AT_START_841
-at_fn_group_banner 841 'ofproto-dpif.at:2948' \
+#AT_STOP_842
+#AT_START_843
+at_fn_group_banner 843 'ofproto-dpif.at:2947' \
   "ofproto-dpif - packet-in reasons (Openflow 1.4)" "" 52
 at_xfail=no
 (
-  $as_echo "841. $at_setup_line: testing $at_desc ..."
+  $as_echo "843. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -126517,29 +127000,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2949: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2949"
+$as_echo "$at_srcdir/ofproto-dpif.at:2948: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:2948"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2948"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2949: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2949"
+$as_echo "$at_srcdir/ofproto-dpif.at:2948: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:2948"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2948"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -126549,49 +127032,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2949: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2948: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2949"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2948"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2948"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2949: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:2949"
+$as_echo "$at_srcdir/ofproto-dpif.at:2948: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:2948"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2948"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2949: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:2949"
+$as_echo "$at_srcdir/ofproto-dpif.at:2948: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:2948"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2948"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -126603,14 +127086,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2949: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:2948: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2949"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2948"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -126618,12 +127101,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2948"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -126632,17 +127115,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2949: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:2948: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2949"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:2948"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2948"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -126663,15 +127146,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2960: ovs-ofctl --protocols=OpenFlow14 add-group br0 'group_id=1234,type=all,bucket=output:10,bucket=output:CONTROLLER'"
-at_fn_check_prepare_trace "ofproto-dpif.at:2960"
+$as_echo "$at_srcdir/ofproto-dpif.at:2959: ovs-ofctl --protocols=OpenFlow14 add-group br0 'group_id=1234,type=all,bucket=output:10,bucket=output:CONTROLLER'"
+at_fn_check_prepare_trace "ofproto-dpif.at:2959"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow14 add-group br0 'group_id=1234,type=all,bucket=output:10,bucket=output:CONTROLLER'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2960"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2959"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126679,15 +127162,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2961: ovs-ofctl --protocols=OpenFlow14 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:2961"
+$as_echo "$at_srcdir/ofproto-dpif.at:2960: ovs-ofctl --protocols=OpenFlow14 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:2960"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow14 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2961"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2960"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126696,15 +127179,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2964: ovs-ofctl monitor -P openflow10 --protocols=OpenFlow14 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2964"
+$as_echo "$at_srcdir/ofproto-dpif.at:2963: ovs-ofctl monitor -P openflow10 --protocols=OpenFlow14 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2963"
 ( $at_check_trace; ovs-ofctl monitor -P openflow10 --protocols=OpenFlow14 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2964"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2963"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126716,19 +127199,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10),tcp_flags(0x002)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2969: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:2968: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2969"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:2968"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2968"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126738,15 +127221,15 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2972: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:2972"
+$as_echo "$at_srcdir/ofproto-dpif.at:2971: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:2971"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2972"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2971"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126755,10 +127238,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:2974: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:2974"
+$as_echo "$at_srcdir/ofproto-dpif.at:2973: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:2973"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -126782,7 +127265,7 @@
 tcp,vlan_tci=0x0000,dl_src=10:11:11:11:11:11,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=8,tp_dst=10,tcp_flags=syn tcp_csum:0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2974"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:2973"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126791,15 +127274,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3003: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:3003"
+$as_echo "$at_srcdir/ofproto-dpif.at:3002: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:3002"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3003"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3002"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126808,10 +127291,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3005: ovs-ofctl --protocols=OpenFlow14 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3005"
+$as_echo "$at_srcdir/ofproto-dpif.at:3004: ovs-ofctl --protocols=OpenFlow14 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3004"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow14 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -126821,7 +127304,7 @@
 OFPST_FLOW reply (OF1.4):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3005"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3004"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126830,15 +127313,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3012: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:3012"
+$as_echo "$at_srcdir/ofproto-dpif.at:3011: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:3011"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3012"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3011"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126846,15 +127329,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3012: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3012"
+$as_echo "$at_srcdir/ofproto-dpif.at:3011: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3011"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3012"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3011"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126862,15 +127345,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3012: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3012"
+$as_echo "$at_srcdir/ofproto-dpif.at:3011: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3011"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3012"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3011"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -126881,13 +127364,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_841
-#AT_START_842
-at_fn_group_banner 842 'ofproto-dpif.at:3016' \
+#AT_STOP_843
+#AT_START_844
+at_fn_group_banner 844 'ofproto-dpif.at:3015' \
   "ofproto-dpif - ARP modification slow-path" "      " 52
 at_xfail=no
 (
-  $as_echo "842. $at_setup_line: testing $at_desc ..."
+  $as_echo "844. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -126897,29 +127380,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3017: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3017"
+$as_echo "$at_srcdir/ofproto-dpif.at:3016: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3016"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3017"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3016"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3017: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3017"
+$as_echo "$at_srcdir/ofproto-dpif.at:3016: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3016"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3017"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3016"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -126929,49 +127412,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3017: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3016: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3017"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3016"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3017"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3016"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3017: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:3017"
+$as_echo "$at_srcdir/ofproto-dpif.at:3016: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:3016"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3017"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3016"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3017: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:3017"
+$as_echo "$at_srcdir/ofproto-dpif.at:3016: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:3016"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3017"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3016"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -126983,14 +127466,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3017: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3016: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3017"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3016"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -126998,12 +127481,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3017"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3016"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127012,15 +127495,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3017: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:3017"
+$as_echo "$at_srcdir/ofproto-dpif.at:3016: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:3016"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3017"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3016"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127039,15 +127522,15 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=80:88:88:88:88:88,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3027: ovs-appctl time/warp 5000"
-at_fn_check_prepare_trace "ofproto-dpif.at:3027"
+$as_echo "$at_srcdir/ofproto-dpif.at:3026: ovs-appctl time/warp 5000"
+at_fn_check_prepare_trace "ofproto-dpif.at:3026"
 ( $at_check_trace; ovs-appctl time/warp 5000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127056,10 +127539,10 @@
 
 # Check the packets that were output.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3030: ovs-ofctl parse-pcap p2.pcap"
-at_fn_check_prepare_trace "ofproto-dpif.at:3030"
+$as_echo "$at_srcdir/ofproto-dpif.at:3029: ovs-ofctl parse-pcap p2.pcap"
+at_fn_check_prepare_trace "ofproto-dpif.at:3029"
 ( $at_check_trace; ovs-ofctl parse-pcap p2.pcap
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -127074,7 +127557,7 @@
 arp,in_port=ANY,vlan_tci=0x0000,dl_src=80:88:88:88:88:88,dl_dst=ff:ff:ff:ff:ff:ff,arp_spa=192.168.128.1,arp_tpa=192.168.0.2,arp_op=2,arp_sha=50:54:00:00:00:05,arp_tha=40:44:44:44:44:41
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3030"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3029"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127082,45 +127565,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3042: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:3042"
+$as_echo "$at_srcdir/ofproto-dpif.at:3041: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:3041"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3042"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3042: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3042"
+$as_echo "$at_srcdir/ofproto-dpif.at:3041: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3041"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3042"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3042: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3042"
+$as_echo "$at_srcdir/ofproto-dpif.at:3041: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3041"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3042"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127130,13 +127613,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_842
-#AT_START_843
-at_fn_group_banner 843 'ofproto-dpif.at:3045' \
+#AT_STOP_844
+#AT_START_845
+at_fn_group_banner 845 'ofproto-dpif.at:3044' \
   "ofproto-dpif - VLAN handling" "                   " 52
 at_xfail=no
 (
-  $as_echo "843. $at_setup_line: testing $at_desc ..."
+  $as_echo "845. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -127146,29 +127629,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3046: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3046"
+$as_echo "$at_srcdir/ofproto-dpif.at:3045: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3045"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3046"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3045"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3046: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3046"
+$as_echo "$at_srcdir/ofproto-dpif.at:3045: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3045"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3046"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3045"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -127178,49 +127661,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3046: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3045: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3046"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3045"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3046"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3045"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3046: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:3046"
+$as_echo "$at_srcdir/ofproto-dpif.at:3045: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:3045"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3046"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3045"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3046: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:3046"
+$as_echo "$at_srcdir/ofproto-dpif.at:3045: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:3045"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3046"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3045"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -127232,14 +127715,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3046: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3045: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3046"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3045"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -127247,12 +127730,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3046"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3045"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127261,7 +127744,7 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3046: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone -- \\
+$as_echo "$at_srcdir/ofproto-dpif.at:3045: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone -- \\
    add-port br0 p1                                  trunks=10,12 -- \\
    add-port br0 p2                           tag=10              -- \\
    add-port br0 p3                           tag=12              \\
@@ -127280,7 +127763,7 @@
    set Interface p6 type=dummy -- \\
    set Interface p7 type=dummy -- \\
    set Interface p8 type=dummy -- "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3046"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3045"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone -- \
    add-port br0 p1                                  trunks=10,12 -- \
    add-port br0 p2                           tag=10              -- \
@@ -127300,12 +127783,12 @@
    set Interface p6 type=dummy -- \
    set Interface p7 type=dummy -- \
    set Interface p8 type=dummy --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3046"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3045"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127412,15 +127895,15 @@
   echo "in_port=$in_port vlan=$vlan pcp=$pcp"
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3168: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:3168"
+$as_echo "$at_srcdir/ofproto-dpif.at:3167: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:3167"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3168"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127429,15 +127912,15 @@
   actual=`tail -1 stdout | sed 's/Datapath actions: //'`
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3171: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\""
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\"" "ofproto-dpif.at:3171"
+$as_echo "$at_srcdir/ofproto-dpif.at:3170: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\""
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\"" "ofproto-dpif.at:3170"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3171"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3170"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127445,15 +127928,15 @@
 
   mv stdout expout
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3173: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\""
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\"" "ofproto-dpif.at:3173"
+$as_echo "$at_srcdir/ofproto-dpif.at:3172: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\""
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\"" "ofproto-dpif.at:3172"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3173"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3172"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127462,45 +127945,45 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3176: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:3176"
+$as_echo "$at_srcdir/ofproto-dpif.at:3175: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:3175"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3176"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3175"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3176: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3176"
+$as_echo "$at_srcdir/ofproto-dpif.at:3175: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3175"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3176"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3175"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3176: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3176"
+$as_echo "$at_srcdir/ofproto-dpif.at:3175: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3175"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3176"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3175"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127510,13 +127993,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_843
-#AT_START_844
-at_fn_group_banner 844 'ofproto-dpif.at:3179' \
+#AT_STOP_845
+#AT_START_846
+at_fn_group_banner 846 'ofproto-dpif.at:3178' \
   "ofproto-dpif - MPLS handling" "                   " 52
 at_xfail=no
 (
-  $as_echo "844. $at_setup_line: testing $at_desc ..."
+  $as_echo "846. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -127526,29 +128009,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3180: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3180"
+$as_echo "$at_srcdir/ofproto-dpif.at:3179: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3179"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3180"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3179"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3180: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3180"
+$as_echo "$at_srcdir/ofproto-dpif.at:3179: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3179"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3180"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3179"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -127558,49 +128041,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3180: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3179: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3180"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3179"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3180"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3179"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3180: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:3180"
+$as_echo "$at_srcdir/ofproto-dpif.at:3179: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:3179"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3180"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3180: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:3180"
+$as_echo "$at_srcdir/ofproto-dpif.at:3179: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:3179"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3180"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -127612,14 +128095,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3180: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3179: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3180"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3179"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -127627,12 +128110,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3180"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127641,17 +128124,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3180: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:3179: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3180"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3179"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3180"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -127672,15 +128155,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3191: ovs-ofctl --protocols=OpenFlow12 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:3191"
+$as_echo "$at_srcdir/ofproto-dpif.at:3190: ovs-ofctl --protocols=OpenFlow12 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:3190"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3191"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3190"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127689,15 +128172,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3194: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3194"
+$as_echo "$at_srcdir/ofproto-dpif.at:3193: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3193"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3194"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3193"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127709,19 +128192,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:00:00,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3199: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3198: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3199"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3198"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3199"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3198"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127730,19 +128213,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3200: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:3199: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3200"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3199"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3200"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3199"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127751,10 +128234,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3202: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3202"
+$as_echo "$at_srcdir/ofproto-dpif.at:3201: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3201"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -127778,7 +128261,7 @@
 00000030  00 00 50 00 00 00 00 00-00 00 00 00 00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3202"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127787,15 +128270,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3227: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3227"
+$as_echo "$at_srcdir/ofproto-dpif.at:3226: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3226"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3227"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3226"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127807,19 +128290,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:00:01,dst=50:54:00:00:00:07),eth_type(0x8847),mpls(label=10,tc=0,ttl=64,bos=1)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3232: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3231: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3232"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3231"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3232"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127828,19 +128311,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3233: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:3232: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3233"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3232"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3233"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3232"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127849,10 +128332,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3235: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3235"
+$as_echo "$at_srcdir/ofproto-dpif.at:3234: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3234"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -127876,7 +128359,7 @@
 00000030  00 00 00 00 00 00 00 00-00 00 00 00 00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3235"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127885,15 +128368,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3262: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3262"
+$as_echo "$at_srcdir/ofproto-dpif.at:3261: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3261"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3262"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3261"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127905,19 +128388,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:00:02,dst=50:54:00:00:00:07),eth_type(0x8847),mpls(label=10,tc=0,ttl=64,bos=1)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3267: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3266: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3267"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3266"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3267"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127925,19 +128408,19 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3268: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:3267: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3268"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3267"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3268"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3267"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127946,10 +128429,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3270: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3270"
+$as_echo "$at_srcdir/ofproto-dpif.at:3269: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3269"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -127973,7 +128456,7 @@
 00000030  00 00 00 00 00 00 00 00-00 00 00 00 00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3270"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3269"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127982,15 +128465,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3293: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:3293"
+$as_echo "$at_srcdir/ofproto-dpif.at:3292: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:3292"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3293"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3292"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -127998,15 +128481,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3293: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3293"
+$as_echo "$at_srcdir/ofproto-dpif.at:3292: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3292"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3293"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3292"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128014,15 +128497,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3293: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3293"
+$as_echo "$at_srcdir/ofproto-dpif.at:3292: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3292"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3293"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3292"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128033,13 +128516,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_844
-#AT_START_845
-at_fn_group_banner 845 'ofproto-dpif.at:3296' \
+#AT_STOP_846
+#AT_START_847
+at_fn_group_banner 847 'ofproto-dpif.at:3295' \
   "ofproto-dpif - VLAN+MPLS handling" "              " 52
 at_xfail=no
 (
-  $as_echo "845. $at_setup_line: testing $at_desc ..."
+  $as_echo "847. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -128049,29 +128532,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3297: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3297"
+$as_echo "$at_srcdir/ofproto-dpif.at:3296: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3296"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3297"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3296"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3297: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3297"
+$as_echo "$at_srcdir/ofproto-dpif.at:3296: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3296"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3297"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3296"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -128081,49 +128564,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3297: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3296: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3297"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3296"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3297"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3296"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3297: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:3297"
+$as_echo "$at_srcdir/ofproto-dpif.at:3296: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:3296"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3297"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3296"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3297: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:3297"
+$as_echo "$at_srcdir/ofproto-dpif.at:3296: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:3296"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3297"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3296"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -128135,14 +128618,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3297: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3296: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3297"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3296"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -128150,12 +128633,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3297"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3296"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -128164,17 +128647,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3297: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:3296: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3297"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3296"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3297"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3296"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -128202,15 +128685,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3315: ovs-ofctl --protocols=OpenFlow12 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:3315"
+$as_echo "$at_srcdir/ofproto-dpif.at:3314: ovs-ofctl --protocols=OpenFlow12 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:3314"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3315"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3314"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128219,15 +128702,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3320: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3320"
+$as_echo "$at_srcdir/ofproto-dpif.at:3319: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3319"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3320"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3319"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128239,19 +128722,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:54:50,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3325: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3324: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3325"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3324"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3325"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3324"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128260,19 +128743,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3326: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:3325: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3326"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3325"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3326"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3325"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128281,10 +128764,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3328: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3328"
+$as_echo "$at_srcdir/ofproto-dpif.at:3327: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3327"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -128311,7 +128794,7 @@
 00000040  00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3328"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3327"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128320,15 +128803,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3357: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3357"
+$as_echo "$at_srcdir/ofproto-dpif.at:3356: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3356"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3357"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3356"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128340,19 +128823,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:54:51,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=88,pcp=7),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no))'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3362: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3361: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3362"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3361"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3362"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3361"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128361,19 +128844,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3363: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:3362: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3363"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3362"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3363"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3362"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128382,10 +128865,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3365: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3365"
+$as_echo "$at_srcdir/ofproto-dpif.at:3364: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3364"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -128409,7 +128892,7 @@
 00000030  00 00 00 00 00 00 50 00-00 00 00 00 00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3365"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3364"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128418,15 +128901,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3391: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3391"
+$as_echo "$at_srcdir/ofproto-dpif.at:3390: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3390"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3391"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3390"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128438,19 +128921,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:54:52,dst=52:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3396: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3395: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3396"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3395"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3396"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3395"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128459,19 +128942,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3397: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:3396: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3397"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3396"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3397"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3396"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128480,10 +128963,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3399: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3399"
+$as_echo "$at_srcdir/ofproto-dpif.at:3398: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3398"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -128510,7 +128993,7 @@
 00000040  00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3399"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3398"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128519,15 +129002,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3428: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3428"
+$as_echo "$at_srcdir/ofproto-dpif.at:3427: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3427"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3428"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128539,19 +129022,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:54:53,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=88,pcp=7),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no))'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3433: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3432: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3433"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3432"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3433"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3432"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128560,19 +129043,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3434: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:3433: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3434"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3433"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3434"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3433"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128581,10 +129064,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3436: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3436"
+$as_echo "$at_srcdir/ofproto-dpif.at:3435: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3435"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -128608,7 +129091,7 @@
 00000030  00 00 00 00 00 00 50 00-00 00 00 00 00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3436"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3435"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128617,15 +129100,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3462: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3462"
+$as_echo "$at_srcdir/ofproto-dpif.at:3461: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3461"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3462"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3461"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128637,19 +129120,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:54:54,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3467: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3466: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3467"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3466"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3467"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3466"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128658,19 +129141,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3468: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:3467: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3468"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3467"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3468"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3467"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128679,10 +129162,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3470: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3470"
+$as_echo "$at_srcdir/ofproto-dpif.at:3469: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3469"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -128709,7 +129192,7 @@
 00000040  00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3470"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3469"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128718,15 +129201,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3499: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3499"
+$as_echo "$at_srcdir/ofproto-dpif.at:3498: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3498"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3499"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3498"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128738,19 +129221,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:54:55,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=88,pcp=7),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no))'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3504: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3503: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3504"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3503"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3504"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3503"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128759,19 +129242,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3505: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:3504: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3505"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3504"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3505"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3504"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128780,10 +129263,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3507: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3507"
+$as_echo "$at_srcdir/ofproto-dpif.at:3506: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3506"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -128807,7 +129290,7 @@
 00000030  00 00 00 00 00 00 50 00-00 00 00 00 00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3507"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3506"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128816,15 +129299,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3533: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3533"
+$as_echo "$at_srcdir/ofproto-dpif.at:3532: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3532"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3533"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3532"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128836,19 +129319,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:54:56,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no)'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3538: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3537: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3538"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3537"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3538"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3537"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128857,19 +129340,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3539: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:3538: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3539"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3538"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3539"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3538"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128878,10 +129361,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3541: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3541"
+$as_echo "$at_srcdir/ofproto-dpif.at:3540: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3540"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -128908,7 +129391,7 @@
 00000040  00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3541"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3540"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128917,15 +129400,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3570: ovs-ofctl --protocols=OpenFlow12 monitor br0 -m 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3570"
+$as_echo "$at_srcdir/ofproto-dpif.at:3569: ovs-ofctl --protocols=OpenFlow12 monitor br0 -m 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3569"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 -m 65534 -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3570"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3569"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128937,19 +129420,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:54:57,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=88,pcp=7),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no))'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3575: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3574: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3575"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3574"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3575"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3574"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128958,19 +129441,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3576: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:3575: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3576"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3575"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3576"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3575"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -128979,10 +129462,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3578: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3578"
+$as_echo "$at_srcdir/ofproto-dpif.at:3577: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3577"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -129006,7 +129489,7 @@
 00000030  00 00 00 00 00 00 50 00-00 00 00 00 00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3578"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3577"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129015,15 +129498,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3604: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3604"
+$as_echo "$at_srcdir/ofproto-dpif.at:3603: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3603"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3604"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3603"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129035,19 +129518,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:54:58,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=88,pcp=7),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no))'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3609: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3608: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3609"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3608"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3609"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3608"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129056,19 +129539,19 @@
 
 ovs-appctl -t ovs-ofctl exit
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3610: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
+$as_echo "$at_srcdir/ofproto-dpif.at:3609: ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3610"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3609"
 ( $at_check_trace; ovs_wait_cond () { if test -e ovs-ofctl.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3610"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3609"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129077,10 +129560,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3612: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3612"
+$as_echo "$at_srcdir/ofproto-dpif.at:3611: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3611"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -129104,7 +129587,7 @@
 00000030  00 00 00 00 00 00 50 00-00 00 00 00 00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3612"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3611"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129113,15 +129596,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3638: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:3638"
+$as_echo "$at_srcdir/ofproto-dpif.at:3637: ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:3637"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 monitor br0 65534 -m -P nxm --detach --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3638"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3637"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129133,19 +129616,19 @@
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=40:44:44:44:54:59,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=88,pcp=7),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no))'
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3643: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
+$as_echo "$at_srcdir/ofproto-dpif.at:3642: ovs_wait_cond () { test \`grep OFPT_PACKET_IN ofctl_monitor.log | wc -l\` -ge 3
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3643"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:3642"
 ( $at_check_trace; ovs_wait_cond () { test `grep OFPT_PACKET_IN ofctl_monitor.log | wc -l` -ge 3
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3643"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3642"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129155,10 +129638,10 @@
 ovs-appctl -t ovs-ofctl exit
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3646: cat ofctl_monitor.log | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3646"
+$as_echo "$at_srcdir/ofproto-dpif.at:3645: cat ofctl_monitor.log | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3645"
 ( $at_check_trace; cat ofctl_monitor.log | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -129182,7 +129665,7 @@
 00000030  00 00 00 00 00 00 50 00-00 00 00 00 00 00 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3646"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3645"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129191,15 +129674,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3669: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:3669"
+$as_echo "$at_srcdir/ofproto-dpif.at:3668: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:3668"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3669"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3668"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129207,10 +129690,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3670: ovs-ofctl --protocols=OpenFlow12 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3670"
+$as_echo "$at_srcdir/ofproto-dpif.at:3669: ovs-ofctl --protocols=OpenFlow12 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3669"
 ( $at_check_trace; ovs-ofctl --protocols=OpenFlow12 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -129227,7 +129710,7 @@
 OFPST_FLOW reply (OF1.2):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3670"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3669"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129236,15 +129719,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3684: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:3684"
+$as_echo "$at_srcdir/ofproto-dpif.at:3683: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:3683"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3684"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3683"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129252,15 +129735,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3684: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3684"
+$as_echo "$at_srcdir/ofproto-dpif.at:3683: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3683"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3684"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3683"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129268,15 +129751,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3684: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3684"
+$as_echo "$at_srcdir/ofproto-dpif.at:3683: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3683"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3684"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3683"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -129287,13 +129770,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_845
-#AT_START_846
-at_fn_group_banner 846 'ofproto-dpif.at:3687' \
+#AT_STOP_847
+#AT_START_848
+at_fn_group_banner 848 'ofproto-dpif.at:3686' \
   "ofproto-dpif - fragment handling - trace" "       " 52
 at_xfail=no
 (
-  $as_echo "846. $at_setup_line: testing $at_desc ..."
+  $as_echo "848. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -129303,29 +129786,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3688: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3688"
+$as_echo "$at_srcdir/ofproto-dpif.at:3687: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3687"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3688"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3687"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3688: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3688"
+$as_echo "$at_srcdir/ofproto-dpif.at:3687: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3687"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3688"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3687"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -129335,49 +129818,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3688: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3687: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3688"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3687"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3688"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3687"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3688: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:3688"
+$as_echo "$at_srcdir/ofproto-dpif.at:3687: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:3687"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3688"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3687"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3688: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:3688"
+$as_echo "$at_srcdir/ofproto-dpif.at:3687: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:3687"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3688"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3687"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -129389,14 +129872,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3688: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3687: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3688"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3687"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -129404,12 +129887,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3688"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3687"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129418,15 +129901,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3688: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:3688"
+$as_echo "$at_srcdir/ofproto-dpif.at:3687: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:3687"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3688"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3687"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129450,15 +129933,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3697: ovs-ofctl replace-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:3697"
+$as_echo "$at_srcdir/ofproto-dpif.at:3696: ovs-ofctl replace-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:3696"
 ( $at_check_trace; ovs-ofctl replace-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3697"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3696"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129483,15 +129966,15 @@
   later=$4
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3716: ovs-ofctl set-frags br0 \$mode"
-at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3716"
+$as_echo "$at_srcdir/ofproto-dpif.at:3715: ovs-ofctl set-frags br0 \$mode"
+at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3715"
 ( $at_check_trace; ovs-ofctl set-frags br0 $mode
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3716"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3715"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129501,15 +129984,15 @@
     eval flow=\$${type}_flow exp_output=\$$type
     printf "\n%s\n" "----$mode $type-----"
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3720: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:3720"
+$as_echo "$at_srcdir/ofproto-dpif.at:3719: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:3719"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3720"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3719"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129525,15 +130008,15 @@
         echo "Datapath actions: set(tcp(src=80,dst=80)),$exp_output" >> expout
     fi
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3730: grep 'IP fragments' stdout; tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:3730"
+$as_echo "$at_srcdir/ofproto-dpif.at:3729: grep 'IP fragments' stdout; tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:3729"
 ( $at_check_trace; grep 'IP fragments' stdout; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3729"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129542,45 +130025,45 @@
   done
 done
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3733: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:3733"
+$as_echo "$at_srcdir/ofproto-dpif.at:3732: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:3732"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3733"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3732"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3733: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3733"
+$as_echo "$at_srcdir/ofproto-dpif.at:3732: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3732"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3733"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3732"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3733: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3733"
+$as_echo "$at_srcdir/ofproto-dpif.at:3732: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3732"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3733"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3732"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129590,13 +130073,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_846
-#AT_START_847
-at_fn_group_banner 847 'ofproto-dpif.at:3736' \
+#AT_STOP_848
+#AT_START_849
+at_fn_group_banner 849 'ofproto-dpif.at:3735' \
   "ofproto-dpif - fragment handling - upcall" "      " 52
 at_xfail=no
 (
-  $as_echo "847. $at_setup_line: testing $at_desc ..."
+  $as_echo "849. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -129606,29 +130089,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3737: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3737"
+$as_echo "$at_srcdir/ofproto-dpif.at:3736: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3736"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3737"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3736"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3737: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3737"
+$as_echo "$at_srcdir/ofproto-dpif.at:3736: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3736"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3737"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3736"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -129638,49 +130121,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3737: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3736: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3737"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3736"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3737"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3736"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3737: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:3737"
+$as_echo "$at_srcdir/ofproto-dpif.at:3736: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:3736"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3737"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3736"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3737: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:3737"
+$as_echo "$at_srcdir/ofproto-dpif.at:3736: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:3736"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3737"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3736"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -129692,14 +130175,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3737: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3736: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3737"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3736"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -129707,12 +130190,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3737"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3736"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129721,15 +130204,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3737: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:3737"
+$as_echo "$at_srcdir/ofproto-dpif.at:3736: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:3736"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3737"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3736"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129753,15 +130236,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3746: ovs-ofctl replace-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:3746"
+$as_echo "$at_srcdir/ofproto-dpif.at:3745: ovs-ofctl replace-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:3745"
 ( $at_check_trace; ovs-ofctl replace-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3746"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3745"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129774,15 +130257,15 @@
 later_flow="$base_flow,frag=later)"
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3753: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:3753"
+$as_echo "$at_srcdir/ofproto-dpif.at:3752: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:3752"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3753"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3752"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129792,15 +130275,15 @@
 mode=normal
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3757: ovs-ofctl set-frags br0 \$mode"
-at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3757"
+$as_echo "$at_srcdir/ofproto-dpif.at:3756: ovs-ofctl set-frags br0 \$mode"
+at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3756"
 ( $at_check_trace; ovs-ofctl set-frags br0 $mode
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3757"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3756"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129811,15 +130294,15 @@
   printf "\n%s\n" "----$mode $type-----"
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3762: ovs-appctl netdev-dummy/receive p90 \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p90 \"$flow\"" "ofproto-dpif.at:3762"
+$as_echo "$at_srcdir/ofproto-dpif.at:3761: ovs-appctl netdev-dummy/receive p90 \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p90 \"$flow\"" "ofproto-dpif.at:3761"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p90 "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3762"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3761"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129828,10 +130311,10 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3765: ovs-appctl dpctl/dump-flows"
-at_fn_check_prepare_trace "ofproto-dpif.at:3765"
+$as_echo "$at_srcdir/ofproto-dpif.at:3764: ovs-appctl dpctl/dump-flows"
+at_fn_check_prepare_trace "ofproto-dpif.at:3764"
 ( $at_check_trace; ovs-appctl dpctl/dump-flows
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -129841,7 +130324,7 @@
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=later), packets:0, bytes:0, used:never, actions:6
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3765"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3764"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129851,30 +130334,30 @@
 mode=drop
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3774: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:3774"
+$as_echo "$at_srcdir/ofproto-dpif.at:3773: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:3773"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3774"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3773"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3775: ovs-ofctl set-frags br0 \$mode"
-at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3775"
+$as_echo "$at_srcdir/ofproto-dpif.at:3774: ovs-ofctl set-frags br0 \$mode"
+at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3774"
 ( $at_check_trace; ovs-ofctl set-frags br0 $mode
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3775"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3774"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129885,15 +130368,15 @@
   printf "\n%s\n" "----$mode $type-----"
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3780: ovs-appctl netdev-dummy/receive p90 \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p90 \"$flow\"" "ofproto-dpif.at:3780"
+$as_echo "$at_srcdir/ofproto-dpif.at:3779: ovs-appctl netdev-dummy/receive p90 \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p90 \"$flow\"" "ofproto-dpif.at:3779"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p90 "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3780"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3779"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129902,10 +130385,10 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3783: ovs-appctl dpctl/dump-flows"
-at_fn_check_prepare_trace "ofproto-dpif.at:3783"
+$as_echo "$at_srcdir/ofproto-dpif.at:3782: ovs-appctl dpctl/dump-flows"
+at_fn_check_prepare_trace "ofproto-dpif.at:3782"
 ( $at_check_trace; ovs-appctl dpctl/dump-flows
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -129915,7 +130398,7 @@
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(frag=later), packets:0, bytes:0, used:never, actions:drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3783"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3782"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129925,30 +130408,30 @@
 mode=nx-match
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3792: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:3792"
+$as_echo "$at_srcdir/ofproto-dpif.at:3791: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:3791"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3792"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3791"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3793: ovs-ofctl set-frags br0 \$mode"
-at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3793"
+$as_echo "$at_srcdir/ofproto-dpif.at:3792: ovs-ofctl set-frags br0 \$mode"
+at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3792"
 ( $at_check_trace; ovs-ofctl set-frags br0 $mode
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3793"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3792"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129959,15 +130442,15 @@
   printf "\n%s\n" "----$mode $type-----"
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3798: ovs-appctl netdev-dummy/receive p90 \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p90 \"$flow\"" "ofproto-dpif.at:3798"
+$as_echo "$at_srcdir/ofproto-dpif.at:3797: ovs-appctl netdev-dummy/receive p90 \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p90 \"$flow\"" "ofproto-dpif.at:3797"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p90 "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3798"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129976,10 +130459,10 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3801: ovs-appctl dpctl/dump-flows"
-at_fn_check_prepare_trace "ofproto-dpif.at:3801"
+$as_echo "$at_srcdir/ofproto-dpif.at:3800: ovs-appctl dpctl/dump-flows"
+at_fn_check_prepare_trace "ofproto-dpif.at:3800"
 ( $at_check_trace; ovs-appctl dpctl/dump-flows
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -129989,7 +130472,7 @@
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=later), packets:0, bytes:0, used:never, actions:6
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3801"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3800"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -129997,45 +130480,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3808: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:3808"
+$as_echo "$at_srcdir/ofproto-dpif.at:3807: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:3807"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3808"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3807"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3808: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3808"
+$as_echo "$at_srcdir/ofproto-dpif.at:3807: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3807"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3808"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3807"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3808: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3808"
+$as_echo "$at_srcdir/ofproto-dpif.at:3807: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3807"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3808"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3807"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130045,13 +130528,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_847
-#AT_START_848
-at_fn_group_banner 848 'ofproto-dpif.at:3811' \
+#AT_STOP_849
+#AT_START_850
+at_fn_group_banner 850 'ofproto-dpif.at:3810' \
   "ofproto-dpif - fragment handling - actions" "     " 52
 at_xfail=no
 (
-  $as_echo "848. $at_setup_line: testing $at_desc ..."
+  $as_echo "850. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -130061,29 +130544,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3812: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3812"
+$as_echo "$at_srcdir/ofproto-dpif.at:3811: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3811"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3812"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3811"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3812: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3812"
+$as_echo "$at_srcdir/ofproto-dpif.at:3811: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3811"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3812"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3811"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -130093,49 +130576,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3812: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3811: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3812"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3811"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3812"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3811"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3812: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:3812"
+$as_echo "$at_srcdir/ofproto-dpif.at:3811: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:3811"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3812"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3811"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3812: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:3812"
+$as_echo "$at_srcdir/ofproto-dpif.at:3811: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:3811"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3812"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3811"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -130147,14 +130630,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3812: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3811: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3812"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3811"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -130162,12 +130645,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3812"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3811"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130176,15 +130659,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3812: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:3812"
+$as_echo "$at_srcdir/ofproto-dpif.at:3811: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:3811"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3812"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3811"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130201,25 +130684,25 @@
     -- add-port br0 p90 -- set Interface p90 type=dummy ofport_request=90
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3815: ovs-ofctl add-flow br0 \"tcp,ip_frag=later actions=move:OXM_OF_TCP_DST[0..7]->OXM_OF_TCP_SRC[0..7],output:1\""
-at_fn_check_prepare_trace "ofproto-dpif.at:3815"
+$as_echo "$at_srcdir/ofproto-dpif.at:3814: ovs-ofctl add-flow br0 \"tcp,ip_frag=later actions=move:OXM_OF_TCP_DST[0..7]->OXM_OF_TCP_SRC[0..7],output:1\""
+at_fn_check_prepare_trace "ofproto-dpif.at:3814"
 ( $at_check_trace; ovs-ofctl add-flow br0 "tcp,ip_frag=later actions=move:OXM_OF_TCP_DST[0..7]->OXM_OF_TCP_SRC[0..7],output:1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3815"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3814"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3816: tail -2 stderr | sed 's/^.*|WARN|//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3816"
+$as_echo "$at_srcdir/ofproto-dpif.at:3815: tail -2 stderr | sed 's/^.*|WARN|//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3815"
 ( $at_check_trace; tail -2 stderr | sed 's/^.*|WARN|//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -130227,7 +130710,7 @@
 ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3816"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3815"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130235,25 +130718,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3821: ovs-ofctl -O OpenFlow15 add-flow br0 \"tcp,ip_frag=later actions=move:OXM_OF_PKT_REG0[0..7]->OXM_OF_TCP_SRC[0..7],output:1\""
-at_fn_check_prepare_trace "ofproto-dpif.at:3821"
+$as_echo "$at_srcdir/ofproto-dpif.at:3820: ovs-ofctl -O OpenFlow15 add-flow br0 \"tcp,ip_frag=later actions=move:OXM_OF_PKT_REG0[0..7]->OXM_OF_TCP_SRC[0..7],output:1\""
+at_fn_check_prepare_trace "ofproto-dpif.at:3820"
 ( $at_check_trace; ovs-ofctl -O OpenFlow15 add-flow br0 "tcp,ip_frag=later actions=move:OXM_OF_PKT_REG0[0..7]->OXM_OF_TCP_SRC[0..7],output:1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3821"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3820"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3822: tail -2 stderr | sed 's/^.*|WARN|//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3822"
+$as_echo "$at_srcdir/ofproto-dpif.at:3821: tail -2 stderr | sed 's/^.*|WARN|//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3821"
 ( $at_check_trace; tail -2 stderr | sed 's/^.*|WARN|//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -130261,7 +130744,7 @@
 ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3822"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3821"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130269,25 +130752,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3827: ovs-ofctl add-flow br0 \"udp,ip_frag=later actions=set_field:8888->udp_src,output:1\""
-at_fn_check_prepare_trace "ofproto-dpif.at:3827"
+$as_echo "$at_srcdir/ofproto-dpif.at:3826: ovs-ofctl add-flow br0 \"udp,ip_frag=later actions=set_field:8888->udp_src,output:1\""
+at_fn_check_prepare_trace "ofproto-dpif.at:3826"
 ( $at_check_trace; ovs-ofctl add-flow br0 "udp,ip_frag=later actions=set_field:8888->udp_src,output:1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3827"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3826"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3828: tail -2 stderr | sed 's/^.*|WARN|//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3828"
+$as_echo "$at_srcdir/ofproto-dpif.at:3827: tail -2 stderr | sed 's/^.*|WARN|//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3827"
 ( $at_check_trace; tail -2 stderr | sed 's/^.*|WARN|//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -130295,7 +130778,7 @@
 ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3828"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3827"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130303,25 +130786,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3833: ovs-ofctl add-flow br0 \"udp,ip_frag=later actions=load:8888->NXM_OF_UDP_DST[],output:1\""
-at_fn_check_prepare_trace "ofproto-dpif.at:3833"
+$as_echo "$at_srcdir/ofproto-dpif.at:3832: ovs-ofctl add-flow br0 \"udp,ip_frag=later actions=load:8888->NXM_OF_UDP_DST[],output:1\""
+at_fn_check_prepare_trace "ofproto-dpif.at:3832"
 ( $at_check_trace; ovs-ofctl add-flow br0 "udp,ip_frag=later actions=load:8888->NXM_OF_UDP_DST[],output:1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3833"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3832"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3834: tail -2 stderr | sed 's/^.*|WARN|//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3834"
+$as_echo "$at_srcdir/ofproto-dpif.at:3833: tail -2 stderr | sed 's/^.*|WARN|//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3833"
 ( $at_check_trace; tail -2 stderr | sed 's/^.*|WARN|//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -130329,7 +130812,7 @@
 ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3834"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3833"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130337,25 +130820,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3839: ovs-ofctl add-flow br0 \"sctp,ip_frag=later actions=set_field:8888->sctp_src,output:1\""
-at_fn_check_prepare_trace "ofproto-dpif.at:3839"
+$as_echo "$at_srcdir/ofproto-dpif.at:3838: ovs-ofctl add-flow br0 \"sctp,ip_frag=later actions=set_field:8888->sctp_src,output:1\""
+at_fn_check_prepare_trace "ofproto-dpif.at:3838"
 ( $at_check_trace; ovs-ofctl add-flow br0 "sctp,ip_frag=later actions=set_field:8888->sctp_src,output:1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3839"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3838"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3840: tail -2 stderr | sed 's/^.*|WARN|//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3840"
+$as_echo "$at_srcdir/ofproto-dpif.at:3839: tail -2 stderr | sed 's/^.*|WARN|//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3839"
 ( $at_check_trace; tail -2 stderr | sed 's/^.*|WARN|//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -130363,7 +130846,7 @@
 ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3840"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3839"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130371,25 +130854,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3845: ovs-ofctl add-flow br0 \"sctp,ip_frag=later actions=set_field:8888->sctp_dst,output:1\""
-at_fn_check_prepare_trace "ofproto-dpif.at:3845"
+$as_echo "$at_srcdir/ofproto-dpif.at:3844: ovs-ofctl add-flow br0 \"sctp,ip_frag=later actions=set_field:8888->sctp_dst,output:1\""
+at_fn_check_prepare_trace "ofproto-dpif.at:3844"
 ( $at_check_trace; ovs-ofctl add-flow br0 "sctp,ip_frag=later actions=set_field:8888->sctp_dst,output:1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3845"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3844"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3846: tail -2 stderr | sed 's/^.*|WARN|//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3846"
+$as_echo "$at_srcdir/ofproto-dpif.at:3845: tail -2 stderr | sed 's/^.*|WARN|//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3845"
 ( $at_check_trace; tail -2 stderr | sed 's/^.*|WARN|//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -130397,7 +130880,7 @@
 ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130405,25 +130888,25 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3851: ovs-ofctl add-flow br0 \"tcp,ip_frag=later actions=learn(table=1,hard_timeout=60,eth_type=0x800,nw_proto=6,NXM_OF_IP_SRC[]=NXM_OF_IP_DST[],NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[],output:NXM_NX_REG0[0..15]),output:1\""
-at_fn_check_prepare_trace "ofproto-dpif.at:3851"
+$as_echo "$at_srcdir/ofproto-dpif.at:3850: ovs-ofctl add-flow br0 \"tcp,ip_frag=later actions=learn(table=1,hard_timeout=60,eth_type=0x800,nw_proto=6,NXM_OF_IP_SRC[]=NXM_OF_IP_DST[],NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[],output:NXM_NX_REG0[0..15]),output:1\""
+at_fn_check_prepare_trace "ofproto-dpif.at:3850"
 ( $at_check_trace; ovs-ofctl add-flow br0 "tcp,ip_frag=later actions=learn(table=1,hard_timeout=60,eth_type=0x800,nw_proto=6,NXM_OF_IP_SRC[]=NXM_OF_IP_DST[],NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[],output:NXM_NX_REG0[0..15]),output:1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3851"
+at_fn_check_status 1 $at_status "$at_srcdir/ofproto-dpif.at:3850"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3852: tail -2 stderr | sed 's/^.*|WARN|//'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3852"
+$as_echo "$at_srcdir/ofproto-dpif.at:3851: tail -2 stderr | sed 's/^.*|WARN|//'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3851"
 ( $at_check_trace; tail -2 stderr | sed 's/^.*|WARN|//'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -130431,7 +130914,7 @@
 ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3852"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3851"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130443,15 +130926,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3860: ovs-ofctl -O OpenFlow12 replace-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:3860"
+$as_echo "$at_srcdir/ofproto-dpif.at:3859: ovs-ofctl -O OpenFlow12 replace-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:3859"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 replace-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3860"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3859"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130459,15 +130942,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3862: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:3862"
+$as_echo "$at_srcdir/ofproto-dpif.at:3861: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:3861"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3862"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3861"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130477,15 +130960,15 @@
 mode=normal
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3866: ovs-ofctl set-frags br0 \$mode"
-at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3866"
+$as_echo "$at_srcdir/ofproto-dpif.at:3865: ovs-ofctl set-frags br0 \$mode"
+at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3865"
 ( $at_check_trace; ovs-ofctl set-frags br0 $mode
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3866"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3865"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130495,15 +130978,15 @@
   printf "\n%s\n" "----$mode $frag-----"
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3870: ovs-appctl netdev-dummy/receive p90 \"0021853763af 0026b98cb0f9 0800 4500 003c 2e24 \$frag 40 06 465d ac11370d ac11370b 828b 0016 751e267b 00000000 a002 16d0 1736 0000 02 04 05 b4 04 02 08 0a 2d 25 08 5f 00 00 00 00 01 03 03 07\""
-at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p90 \"0021853763af 0026b98cb0f9 0800 4500 003c 2e24 $frag 40 06 465d ac11370d ac11370b 828b 0016 751e267b 00000000 a002 16d0 1736 0000 02 04 05 b4 04 02 08 0a 2d 25 08 5f 00 00 00 00 01 03 03 07\"" "ofproto-dpif.at:3870"
+$as_echo "$at_srcdir/ofproto-dpif.at:3869: ovs-appctl netdev-dummy/receive p90 \"0021853763af 0026b98cb0f9 0800 4500 003c 2e24 \$frag 40 06 465d ac11370d ac11370b 828b 0016 751e267b 00000000 a002 16d0 1736 0000 02 04 05 b4 04 02 08 0a 2d 25 08 5f 00 00 00 00 01 03 03 07\""
+at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p90 \"0021853763af 0026b98cb0f9 0800 4500 003c 2e24 $frag 40 06 465d ac11370d ac11370b 828b 0016 751e267b 00000000 a002 16d0 1736 0000 02 04 05 b4 04 02 08 0a 2d 25 08 5f 00 00 00 00 01 03 03 07\"" "ofproto-dpif.at:3869"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p90 "0021853763af 0026b98cb0f9 0800 4500 003c 2e24 $frag 40 06 465d ac11370d ac11370b 828b 0016 751e267b 00000000 a002 16d0 1736 0000 02 04 05 b4 04 02 08 0a 2d 25 08 5f 00 00 00 00 01 03 03 07"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3870"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3869"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130512,10 +130995,10 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3873: ovs-appctl dpctl/dump-flows | sed 's/used:[0-9].[0-9]*s/used:0.001s/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3873"
+$as_echo "$at_srcdir/ofproto-dpif.at:3872: ovs-appctl dpctl/dump-flows | sed 's/used:[0-9].[0-9]*s/used:0.001s/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3872"
 ( $at_check_trace; ovs-appctl dpctl/dump-flows | sed 's/used:[0-9].[0-9]*s/used:0.001s/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -130525,7 +131008,7 @@
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=later), packets:1, bytes:74, used:0.001s, actions:1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3873"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3872"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130533,30 +131016,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3880: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:3880"
+$as_echo "$at_srcdir/ofproto-dpif.at:3879: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:3879"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3880"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3879"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3881: ovs-ofctl set-frags br0 \$mode"
-at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3881"
+$as_echo "$at_srcdir/ofproto-dpif.at:3880: ovs-ofctl set-frags br0 \$mode"
+at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3880"
 ( $at_check_trace; ovs-ofctl set-frags br0 $mode
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3881"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3880"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130566,15 +131049,15 @@
   printf "\n%s\n" "----$mode $frag truncated transport header -----"
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3885: ovs-appctl netdev-dummy/receive p90 \"0021853763af 0026b98cb0f9 0800 4500 0018 2e24 \$frag 40 06 465d ac11370d ac11370b 828b 0016\""
-at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p90 \"0021853763af 0026b98cb0f9 0800 4500 0018 2e24 $frag 40 06 465d ac11370d ac11370b 828b 0016\"" "ofproto-dpif.at:3885"
+$as_echo "$at_srcdir/ofproto-dpif.at:3884: ovs-appctl netdev-dummy/receive p90 \"0021853763af 0026b98cb0f9 0800 4500 0018 2e24 \$frag 40 06 465d ac11370d ac11370b 828b 0016\""
+at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p90 \"0021853763af 0026b98cb0f9 0800 4500 0018 2e24 $frag 40 06 465d ac11370d ac11370b 828b 0016\"" "ofproto-dpif.at:3884"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p90 "0021853763af 0026b98cb0f9 0800 4500 0018 2e24 $frag 40 06 465d ac11370d ac11370b 828b 0016"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3885"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130583,10 +131066,10 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3888: ovs-appctl dpctl/dump-flows | sed 's/used:[0-9].[0-9]*s/used:0.001s/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3888"
+$as_echo "$at_srcdir/ofproto-dpif.at:3887: ovs-appctl dpctl/dump-flows | sed 's/used:[0-9].[0-9]*s/used:0.001s/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3887"
 ( $at_check_trace; ovs-appctl dpctl/dump-flows | sed 's/used:[0-9].[0-9]*s/used:0.001s/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -130596,7 +131079,7 @@
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=later), packets:1, bytes:60, used:0.001s, actions:1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3888"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3887"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130604,30 +131087,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3895: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:3895"
+$as_echo "$at_srcdir/ofproto-dpif.at:3894: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:3894"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3895"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3894"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3896: ovs-ofctl set-frags br0 \$mode"
-at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3896"
+$as_echo "$at_srcdir/ofproto-dpif.at:3895: ovs-ofctl set-frags br0 \$mode"
+at_fn_check_prepare_dynamic "ovs-ofctl set-frags br0 $mode" "ofproto-dpif.at:3895"
 ( $at_check_trace; ovs-ofctl set-frags br0 $mode
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3896"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3895"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130637,15 +131120,15 @@
   printf "\n%s\n" "----$mode $frag missing transport header-----"
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3900: ovs-appctl netdev-dummy/receive p90 \"0021853763af 0026b98cb0f9 0800 4500 0014 2e24 \$frag 40 06 465d ac11370d ac11370b\""
-at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p90 \"0021853763af 0026b98cb0f9 0800 4500 0014 2e24 $frag 40 06 465d ac11370d ac11370b\"" "ofproto-dpif.at:3900"
+$as_echo "$at_srcdir/ofproto-dpif.at:3899: ovs-appctl netdev-dummy/receive p90 \"0021853763af 0026b98cb0f9 0800 4500 0014 2e24 \$frag 40 06 465d ac11370d ac11370b\""
+at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p90 \"0021853763af 0026b98cb0f9 0800 4500 0014 2e24 $frag 40 06 465d ac11370d ac11370b\"" "ofproto-dpif.at:3899"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p90 "0021853763af 0026b98cb0f9 0800 4500 0014 2e24 $frag 40 06 465d ac11370d ac11370b"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3900"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3899"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130654,10 +131137,10 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3903: ovs-appctl dpctl/dump-flows | sed 's/used:[0-9].[0-9]*s/used:0.001s/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3903"
+$as_echo "$at_srcdir/ofproto-dpif.at:3902: ovs-appctl dpctl/dump-flows | sed 's/used:[0-9].[0-9]*s/used:0.001s/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:3902"
 ( $at_check_trace; ovs-appctl dpctl/dump-flows | sed 's/used:[0-9].[0-9]*s/used:0.001s/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -130667,7 +131150,7 @@
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=later), packets:1, bytes:60, used:0.001s, actions:1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3903"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3902"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130675,45 +131158,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3910: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:3910"
+$as_echo "$at_srcdir/ofproto-dpif.at:3909: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:3909"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3910"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3909"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3910: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3910"
+$as_echo "$at_srcdir/ofproto-dpif.at:3909: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3909"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3910"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3909"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3910: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3910"
+$as_echo "$at_srcdir/ofproto-dpif.at:3909: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3909"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3910"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3909"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130723,13 +131206,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_848
-#AT_START_849
-at_fn_group_banner 849 'ofproto-dpif.at:3913' \
+#AT_STOP_850
+#AT_START_851
+at_fn_group_banner 851 'ofproto-dpif.at:3912' \
   "ofproto-dpif - exit" "                            " 52
 at_xfail=no
 (
-  $as_echo "849. $at_setup_line: testing $at_desc ..."
+  $as_echo "851. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -130739,29 +131222,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3914: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3914"
+$as_echo "$at_srcdir/ofproto-dpif.at:3913: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3913"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3914"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3913"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3914: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3914"
+$as_echo "$at_srcdir/ofproto-dpif.at:3913: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3913"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3914"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3913"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -130771,49 +131254,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3914: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3913: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3914"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3913"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3914"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3913"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3914: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:3914"
+$as_echo "$at_srcdir/ofproto-dpif.at:3913: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:3913"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3914"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3913"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3914: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:3914"
+$as_echo "$at_srcdir/ofproto-dpif.at:3913: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:3913"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3914"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3913"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -130825,14 +131308,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3914: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3913: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3914"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3913"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -130840,12 +131323,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3914"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3913"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130854,15 +131337,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3914: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:3914"
+$as_echo "$at_srcdir/ofproto-dpif.at:3913: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:3913"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3914"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3913"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -130885,156 +131368,156 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3921: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:3921"
+$as_echo "$at_srcdir/ofproto-dpif.at:3920: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:3920"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3921"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3920"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3922: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:3922"
+$as_echo "$at_srcdir/ofproto-dpif.at:3921: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:3921"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3922"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3921"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3923: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:3923"
+$as_echo "$at_srcdir/ofproto-dpif.at:3922: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:3922"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 10
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3923"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3922"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3926: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:3926"
+$as_echo "$at_srcdir/ofproto-dpif.at:3925: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:3925"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3926"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3925"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3927: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:3927"
+$as_echo "$at_srcdir/ofproto-dpif.at:3926: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:3926"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 12,10
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3927"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3926"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3930: ovs-appctl ofproto/trace ovs-dummy 'in_port(3),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:3930"
+$as_echo "$at_srcdir/ofproto-dpif.at:3929: ovs-appctl ofproto/trace ovs-dummy 'in_port(3),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:3929"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(3),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3930"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3929"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3931: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:3931"
+$as_echo "$at_srcdir/ofproto-dpif.at:3930: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:3930"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 13,12,10
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3931"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3930"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3934: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:3934"
+$as_echo "$at_srcdir/ofproto-dpif.at:3933: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:3933"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3934"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3933"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3934: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3934"
+$as_echo "$at_srcdir/ofproto-dpif.at:3933: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3933"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3934"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3933"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3934: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3934"
+$as_echo "$at_srcdir/ofproto-dpif.at:3933: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3933"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3934"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3933"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131044,13 +131527,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_849
-#AT_START_850
-at_fn_group_banner 850 'ofproto-dpif.at:3938' \
+#AT_STOP_851
+#AT_START_852
+at_fn_group_banner 852 'ofproto-dpif.at:3937' \
   "ofproto-dpif - mirroring, select_all" "           " 52
 at_xfail=no
 (
-  $as_echo "850. $at_setup_line: testing $at_desc ..."
+  $as_echo "852. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -131060,29 +131543,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3939: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3939"
+$as_echo "$at_srcdir/ofproto-dpif.at:3938: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3938"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3939"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3938"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3939: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3939"
+$as_echo "$at_srcdir/ofproto-dpif.at:3938: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3938"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3939"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3938"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -131092,49 +131575,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3939: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3938: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3939"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3938"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3939"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3938"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3939: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:3939"
+$as_echo "$at_srcdir/ofproto-dpif.at:3938: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:3938"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3939"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3939: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:3939"
+$as_echo "$at_srcdir/ofproto-dpif.at:3938: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:3938"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3939"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -131146,14 +131629,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3939: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3938: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3939"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3938"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -131161,12 +131644,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3939"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131175,15 +131658,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3939: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:3939"
+$as_echo "$at_srcdir/ofproto-dpif.at:3938: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:3938"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3939"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131205,15 +131688,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3950: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:3950"
+$as_echo "$at_srcdir/ofproto-dpif.at:3949: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:3949"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3950"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3949"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131222,32 +131705,32 @@
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3953: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:3953"
+$as_echo "$at_srcdir/ofproto-dpif.at:3952: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:3952"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3953"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3952"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3954: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:3954"
+$as_echo "$at_srcdir/ofproto-dpif.at:3953: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:3953"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2,3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3954"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3953"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131256,32 +131739,32 @@
 
 flow="in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3959: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:3959"
+$as_echo "$at_srcdir/ofproto-dpif.at:3958: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:3958"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3959"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3958"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3960: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:3960"
+$as_echo "$at_srcdir/ofproto-dpif.at:3959: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:3959"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 1,3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3960"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3959"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131289,45 +131772,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3964: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:3964"
+$as_echo "$at_srcdir/ofproto-dpif.at:3963: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:3963"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3964"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3963"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3964: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3964"
+$as_echo "$at_srcdir/ofproto-dpif.at:3963: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3963"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3964"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3963"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3964: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3964"
+$as_echo "$at_srcdir/ofproto-dpif.at:3963: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3963"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3964"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3963"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131337,13 +131820,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_850
-#AT_START_851
-at_fn_group_banner 851 'ofproto-dpif.at:3968' \
+#AT_STOP_852
+#AT_START_853
+at_fn_group_banner 853 'ofproto-dpif.at:3967' \
   "ofproto-dpif - mirroring, select_src" "           " 52
 at_xfail=no
 (
-  $as_echo "851. $at_setup_line: testing $at_desc ..."
+  $as_echo "853. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -131353,29 +131836,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3969: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3969"
+$as_echo "$at_srcdir/ofproto-dpif.at:3968: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3968"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3968"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3969: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3969"
+$as_echo "$at_srcdir/ofproto-dpif.at:3968: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3968"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3968"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -131385,49 +131868,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3969: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3968: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3969"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3968"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3968"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3969: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:3969"
+$as_echo "$at_srcdir/ofproto-dpif.at:3968: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:3968"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3968"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3969: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:3969"
+$as_echo "$at_srcdir/ofproto-dpif.at:3968: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:3968"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3968"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -131439,14 +131922,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3969: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3968: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3969"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3968"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -131454,12 +131937,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3968"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131468,15 +131951,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3969: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:3969"
+$as_echo "$at_srcdir/ofproto-dpif.at:3968: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:3968"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3968"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131498,15 +131981,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3980: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:3980"
+$as_echo "$at_srcdir/ofproto-dpif.at:3979: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:3979"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3980"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3979"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131515,32 +131998,32 @@
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3983: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:3983"
+$as_echo "$at_srcdir/ofproto-dpif.at:3982: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:3982"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3983"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3982"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3984: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:3984"
+$as_echo "$at_srcdir/ofproto-dpif.at:3983: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:3983"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2,3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3984"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131549,77 +132032,77 @@
 
 flow="in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3989: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:3989"
+$as_echo "$at_srcdir/ofproto-dpif.at:3988: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:3988"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3989"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3988"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3990: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:3990"
+$as_echo "$at_srcdir/ofproto-dpif.at:3989: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:3989"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3990"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3989"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3993: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:3993"
+$as_echo "$at_srcdir/ofproto-dpif.at:3992: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:3992"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3993"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3992"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3993: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3993"
+$as_echo "$at_srcdir/ofproto-dpif.at:3992: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3992"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3993"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3992"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3993: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:3993"
+$as_echo "$at_srcdir/ofproto-dpif.at:3992: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:3992"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3993"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3992"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131629,13 +132112,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_851
-#AT_START_852
-at_fn_group_banner 852 'ofproto-dpif.at:3996' \
+#AT_STOP_853
+#AT_START_854
+at_fn_group_banner 854 'ofproto-dpif.at:3995' \
   "ofproto-dpif - mirroring, OFPP_NONE ingress port" "" 52
 at_xfail=no
 (
-  $as_echo "852. $at_setup_line: testing $at_desc ..."
+  $as_echo "854. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -131645,29 +132128,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3997: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3997"
+$as_echo "$at_srcdir/ofproto-dpif.at:3996: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:3996"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3997"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3996"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3997: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3997"
+$as_echo "$at_srcdir/ofproto-dpif.at:3996: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:3996"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3997"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3996"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -131677,49 +132160,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3997: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3996: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3997"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3996"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3997"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3996"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3997: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:3997"
+$as_echo "$at_srcdir/ofproto-dpif.at:3996: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:3996"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3997"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3996"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3997: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:3997"
+$as_echo "$at_srcdir/ofproto-dpif.at:3996: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:3996"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3997"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3996"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -131731,14 +132214,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3997: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:3996: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3997"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:3996"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -131746,12 +132229,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3997"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3996"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131760,15 +132243,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:3997: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:3997"
+$as_echo "$at_srcdir/ofproto-dpif.at:3996: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:3996"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3997"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:3996"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131784,15 +132267,15 @@
         --id=@m create Mirror name=mymirror select_all=true output_port=@p2
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4004: ovs-ofctl add-flow br0 action=output:1"
-at_fn_check_prepare_trace "ofproto-dpif.at:4004"
+$as_echo "$at_srcdir/ofproto-dpif.at:4003: ovs-ofctl add-flow br0 action=output:1"
+at_fn_check_prepare_trace "ofproto-dpif.at:4003"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=output:1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4004"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4003"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131802,32 +132285,32 @@
 # "in_port" defaults to OFPP_NONE if it's not specified.
 flow="icmp,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_ttl=128,icmp_type=8,icmp_code=0"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4008: ovs-appctl ofproto/trace br0 \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$flow\"" "ofproto-dpif.at:4008"
+$as_echo "$at_srcdir/ofproto-dpif.at:4007: ovs-appctl ofproto/trace br0 \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$flow\"" "ofproto-dpif.at:4007"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4008"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4007"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4009: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4009"
+$as_echo "$at_srcdir/ofproto-dpif.at:4008: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4008"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 1,2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4009"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4008"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131835,45 +132318,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4013: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:4013"
+$as_echo "$at_srcdir/ofproto-dpif.at:4012: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:4012"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4013"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4012"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4013: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4013"
+$as_echo "$at_srcdir/ofproto-dpif.at:4012: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4012"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4013"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4012"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4013: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4013"
+$as_echo "$at_srcdir/ofproto-dpif.at:4012: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4012"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4013"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4012"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -131883,13 +132366,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_852
-#AT_START_853
-at_fn_group_banner 853 'ofproto-dpif.at:4017' \
+#AT_STOP_854
+#AT_START_855
+at_fn_group_banner 855 'ofproto-dpif.at:4016' \
   "ofproto-dpif - mirroring, select_dst" "           " 52
 at_xfail=no
 (
-  $as_echo "853. $at_setup_line: testing $at_desc ..."
+  $as_echo "855. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -131899,29 +132382,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4018: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4018"
+$as_echo "$at_srcdir/ofproto-dpif.at:4017: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4017"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4018"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4017"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4018: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4018"
+$as_echo "$at_srcdir/ofproto-dpif.at:4017: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4017"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4018"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4017"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -131931,49 +132414,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4018: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4017: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4018"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4017"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4018"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4017"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4018: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:4018"
+$as_echo "$at_srcdir/ofproto-dpif.at:4017: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:4017"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4018"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4017"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4018: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:4018"
+$as_echo "$at_srcdir/ofproto-dpif.at:4017: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:4017"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4018"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4017"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -131985,14 +132468,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4018: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4017: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4018"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4017"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -132000,12 +132483,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4018"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4017"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132014,15 +132497,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4018: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:4018"
+$as_echo "$at_srcdir/ofproto-dpif.at:4017: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:4017"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4018"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4017"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132044,15 +132527,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4029: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:4029"
+$as_echo "$at_srcdir/ofproto-dpif.at:4028: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:4028"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4029"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4028"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132061,32 +132544,32 @@
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4032: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4032"
+$as_echo "$at_srcdir/ofproto-dpif.at:4031: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4031"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4032"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4031"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4033: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4033"
+$as_echo "$at_srcdir/ofproto-dpif.at:4032: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4032"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2,3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4033"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4032"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132095,32 +132578,32 @@
 
 flow="in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4038: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4038"
+$as_echo "$at_srcdir/ofproto-dpif.at:4037: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4037"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4038"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4037"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4039: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4039"
+$as_echo "$at_srcdir/ofproto-dpif.at:4038: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4038"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4039"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4038"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132128,45 +132611,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4043: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:4043"
+$as_echo "$at_srcdir/ofproto-dpif.at:4042: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:4042"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4043"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4043: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4043"
+$as_echo "$at_srcdir/ofproto-dpif.at:4042: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4042"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4043"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4043: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4043"
+$as_echo "$at_srcdir/ofproto-dpif.at:4042: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4042"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4043"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132176,13 +132659,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_853
-#AT_START_854
-at_fn_group_banner 854 'ofproto-dpif.at:4047' \
+#AT_STOP_855
+#AT_START_856
+at_fn_group_banner 856 'ofproto-dpif.at:4046' \
   "ofproto-dpif - mirroring, select_vlan" "          " 52
 at_xfail=no
 (
-  $as_echo "854. $at_setup_line: testing $at_desc ..."
+  $as_echo "856. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -132192,29 +132675,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4048: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4048"
+$as_echo "$at_srcdir/ofproto-dpif.at:4047: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4047"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4048"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4047"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4048: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4048"
+$as_echo "$at_srcdir/ofproto-dpif.at:4047: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4047"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4048"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4047"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -132224,49 +132707,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4048: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4047: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4048"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4047"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4048"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4047"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4048: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:4048"
+$as_echo "$at_srcdir/ofproto-dpif.at:4047: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:4047"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4048"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4047"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4048: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:4048"
+$as_echo "$at_srcdir/ofproto-dpif.at:4047: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:4047"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4048"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4047"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -132278,14 +132761,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4048: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4047: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4048"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4047"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -132293,12 +132776,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4048"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4047"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132307,15 +132790,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4048: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:4048"
+$as_echo "$at_srcdir/ofproto-dpif.at:4047: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:4047"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4048"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4047"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132336,15 +132819,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4058: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:4058"
+$as_echo "$at_srcdir/ofproto-dpif.at:4057: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:4057"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4058"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4057"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132353,32 +132836,32 @@
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4061: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4061"
+$as_echo "$at_srcdir/ofproto-dpif.at:4060: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4060"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4061"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4060"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4062: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4062"
+$as_echo "$at_srcdir/ofproto-dpif.at:4061: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4061"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4062"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4061"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132387,32 +132870,32 @@
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=10,pcp=0),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0))"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4067: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4067"
+$as_echo "$at_srcdir/ofproto-dpif.at:4066: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4066"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4067"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4066"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4068: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4068"
+$as_echo "$at_srcdir/ofproto-dpif.at:4067: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4067"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4068"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4067"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132421,32 +132904,32 @@
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=11,pcp=0),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0))"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4073: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4073"
+$as_echo "$at_srcdir/ofproto-dpif.at:4072: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4072"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4073"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4072"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4074: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4074"
+$as_echo "$at_srcdir/ofproto-dpif.at:4073: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4073"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2,3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4074"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4073"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132454,45 +132937,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4078: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:4078"
+$as_echo "$at_srcdir/ofproto-dpif.at:4077: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:4077"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4078"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4077"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4078: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4078"
+$as_echo "$at_srcdir/ofproto-dpif.at:4077: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4077"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4078"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4077"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4078: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4078"
+$as_echo "$at_srcdir/ofproto-dpif.at:4077: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4077"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4078"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4077"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132502,13 +132985,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_854
-#AT_START_855
-at_fn_group_banner 855 'ofproto-dpif.at:4082' \
+#AT_STOP_856
+#AT_START_857
+at_fn_group_banner 857 'ofproto-dpif.at:4081' \
   "ofproto-dpif - mirroring, output_port" "          " 52
 at_xfail=no
 (
-  $as_echo "855. $at_setup_line: testing $at_desc ..."
+  $as_echo "857. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -132518,29 +133001,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4083: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4083"
+$as_echo "$at_srcdir/ofproto-dpif.at:4082: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4082"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4083"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4082"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4083: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4083"
+$as_echo "$at_srcdir/ofproto-dpif.at:4082: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4082"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4083"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4082"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -132550,49 +133033,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4083: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4082: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4083"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4082"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4083"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4082"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4083: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:4083"
+$as_echo "$at_srcdir/ofproto-dpif.at:4082: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:4082"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4083"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4082"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4083: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:4083"
+$as_echo "$at_srcdir/ofproto-dpif.at:4082: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:4082"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4083"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4082"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -132604,14 +133087,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4083: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4082: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4083"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4082"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -132619,12 +133102,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4083"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4082"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132633,15 +133116,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4083: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:4083"
+$as_echo "$at_srcdir/ofproto-dpif.at:4082: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:4082"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4083"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4082"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132663,15 +133146,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4094: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:4094"
+$as_echo "$at_srcdir/ofproto-dpif.at:4093: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:4093"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4094"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4093"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132680,32 +133163,32 @@
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4097: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4097"
+$as_echo "$at_srcdir/ofproto-dpif.at:4096: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4096"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4097"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4098: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4098"
+$as_echo "$at_srcdir/ofproto-dpif.at:4097: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4097"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: push_vlan(vid=17,pcp=0),2,pop_vlan,3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4098"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132714,32 +133197,32 @@
 
 flow="in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4103: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4103"
+$as_echo "$at_srcdir/ofproto-dpif.at:4102: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4102"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4103"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4104: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4104"
+$as_echo "$at_srcdir/ofproto-dpif.at:4103: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4103"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 1,3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4104"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4103"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132747,45 +133230,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4108: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:4108"
+$as_echo "$at_srcdir/ofproto-dpif.at:4107: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:4107"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4108"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4107"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4108: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4108"
+$as_echo "$at_srcdir/ofproto-dpif.at:4107: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4107"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4108"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4107"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4108: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4108"
+$as_echo "$at_srcdir/ofproto-dpif.at:4107: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4107"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4108"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4107"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132795,13 +133278,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_855
-#AT_START_856
-at_fn_group_banner 856 'ofproto-dpif.at:4111' \
+#AT_STOP_857
+#AT_START_858
+at_fn_group_banner 858 'ofproto-dpif.at:4110' \
   "ofproto-dpif - mirroring, output_vlan" "          " 52
 at_xfail=no
 (
-  $as_echo "856. $at_setup_line: testing $at_desc ..."
+  $as_echo "858. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -132811,29 +133294,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4112: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4112"
+$as_echo "$at_srcdir/ofproto-dpif.at:4111: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4111"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4112"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4111"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4112: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4112"
+$as_echo "$at_srcdir/ofproto-dpif.at:4111: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4111"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4112"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4111"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -132843,49 +133326,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4112: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4111: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4112"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4111"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4112"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4111"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4112: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:4112"
+$as_echo "$at_srcdir/ofproto-dpif.at:4111: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:4111"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4112"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4111"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4112: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:4112"
+$as_echo "$at_srcdir/ofproto-dpif.at:4111: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:4111"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4112"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4111"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -132897,14 +133380,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4112: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4111: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4112"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4111"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -132912,12 +133395,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4112"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4111"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132926,15 +133409,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4112: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:4112"
+$as_echo "$at_srcdir/ofproto-dpif.at:4111: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:4111"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4112"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4111"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132954,15 +133437,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4122: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:4122"
+$as_echo "$at_srcdir/ofproto-dpif.at:4121: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:4121"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4122"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4121"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132971,15 +133454,15 @@
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4125: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4125"
+$as_echo "$at_srcdir/ofproto-dpif.at:4124: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4124"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4125"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4124"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -132989,15 +133472,15 @@
 
 expected="2,push_vlan(vid=12,pcp=0),1,2,100"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4129: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\""
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\"" "ofproto-dpif.at:4129"
+$as_echo "$at_srcdir/ofproto-dpif.at:4128: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\""
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\"" "ofproto-dpif.at:4128"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4129"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4128"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133005,15 +133488,15 @@
 
 mv stdout expout
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4131: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\""
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\"" "ofproto-dpif.at:4131"
+$as_echo "$at_srcdir/ofproto-dpif.at:4130: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\""
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\"" "ofproto-dpif.at:4130"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4131"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4130"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133022,15 +133505,15 @@
 
 flow="in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4134: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4134"
+$as_echo "$at_srcdir/ofproto-dpif.at:4133: ovs-appctl ofproto/trace ovs-dummy \"\$flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\"" "ofproto-dpif.at:4133"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4134"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4133"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133040,15 +133523,15 @@
 
 expected="push_vlan(vid=17,pcp=0),1,pop_vlan,push_vlan(vid=12,pcp=0),1,2,100"
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4138: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\""
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\"" "ofproto-dpif.at:4138"
+$as_echo "$at_srcdir/ofproto-dpif.at:4137: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\""
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\"" "ofproto-dpif.at:4137"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4138"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4137"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133056,15 +133539,15 @@
 
 mv stdout expout
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4140: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\""
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\"" "ofproto-dpif.at:4140"
+$as_echo "$at_srcdir/ofproto-dpif.at:4139: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\""
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\"" "ofproto-dpif.at:4139"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4140"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4139"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133072,45 +133555,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4142: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:4142"
+$as_echo "$at_srcdir/ofproto-dpif.at:4141: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:4141"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4142"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4142: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4142"
+$as_echo "$at_srcdir/ofproto-dpif.at:4141: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4141"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4142"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4142: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4142"
+$as_echo "$at_srcdir/ofproto-dpif.at:4141: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4141"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4142"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133120,13 +133603,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_856
-#AT_START_857
-at_fn_group_banner 857 'ofproto-dpif.at:4149' \
+#AT_STOP_858
+#AT_START_859
+at_fn_group_banner 859 'ofproto-dpif.at:4148' \
   "ofproto-dpif - ofproto/trace command 1" "         " 52
 at_xfail=no
 (
-  $as_echo "857. $at_setup_line: testing $at_desc ..."
+  $as_echo "859. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -133136,29 +133619,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4150: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4150"
+$as_echo "$at_srcdir/ofproto-dpif.at:4149: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4149"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4150"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4149"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4150: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4150"
+$as_echo "$at_srcdir/ofproto-dpif.at:4149: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4149"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4150"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4149"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -133168,49 +133651,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4150: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4149: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4150"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4149"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4150"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4149"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4150: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:4150"
+$as_echo "$at_srcdir/ofproto-dpif.at:4149: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:4149"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4150"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4149"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4150: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:4150"
+$as_echo "$at_srcdir/ofproto-dpif.at:4149: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:4149"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4150"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4149"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -133222,14 +133705,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4150: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4149: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4150"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4149"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -133237,12 +133720,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4150"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4149"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133251,15 +133734,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4150: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 fail-mode=standalone "
-at_fn_check_prepare_trace "ofproto-dpif.at:4150"
+$as_echo "$at_srcdir/ofproto-dpif.at:4149: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 fail-mode=standalone "
+at_fn_check_prepare_trace "ofproto-dpif.at:4149"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 fail-mode=standalone
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4150"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4149"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133277,15 +133760,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4157: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:4157"
+$as_echo "$at_srcdir/ofproto-dpif.at:4156: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:4156"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4157"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4156"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133296,32 +133779,32 @@
 br_flow="in_port=1"
 # Test command: ofproto/trace odp_flow with in_port as a name.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4162: ovs-appctl ofproto/trace \"\$odp_flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$odp_flow\"" "ofproto-dpif.at:4162"
+$as_echo "$at_srcdir/ofproto-dpif.at:4161: ovs-appctl ofproto/trace \"\$odp_flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$odp_flow\"" "ofproto-dpif.at:4161"
 ( $at_check_trace; ovs-appctl ofproto/trace "$odp_flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4162"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4161"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4163: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4163"
+$as_echo "$at_srcdir/ofproto-dpif.at:4162: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4162"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4163"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4162"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133331,32 +133814,32 @@
 odp_flow="in_port(1)"
 # Test command: ofproto/trace odp_flow
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4169: ovs-appctl ofproto/trace \"\$odp_flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$odp_flow\"" "ofproto-dpif.at:4169"
+$as_echo "$at_srcdir/ofproto-dpif.at:4168: ovs-appctl ofproto/trace \"\$odp_flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$odp_flow\"" "ofproto-dpif.at:4168"
 ( $at_check_trace; ovs-appctl ofproto/trace "$odp_flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4169"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4168"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4170: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4170"
+$as_echo "$at_srcdir/ofproto-dpif.at:4169: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4169"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4170"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4169"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133365,32 +133848,32 @@
 
 # Test command: ofproto/trace dp_name odp_flow
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4175: ovs-appctl ofproto/trace ovs-dummy \"\$odp_flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$odp_flow\"" "ofproto-dpif.at:4175"
+$as_echo "$at_srcdir/ofproto-dpif.at:4174: ovs-appctl ofproto/trace ovs-dummy \"\$odp_flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$odp_flow\"" "ofproto-dpif.at:4174"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$odp_flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4175"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4176: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4176"
+$as_echo "$at_srcdir/ofproto-dpif.at:4175: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4175"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4176"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4175"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133398,32 +133881,32 @@
 
 # Test commmand: ofproto/trace br_name br_flow
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4180: ovs-appctl ofproto/trace br0 \"\$br_flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$br_flow\"" "ofproto-dpif.at:4180"
+$as_echo "$at_srcdir/ofproto-dpif.at:4179: ovs-appctl ofproto/trace br0 \"\$br_flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$br_flow\"" "ofproto-dpif.at:4179"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "$br_flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4180"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4181: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4181"
+$as_echo "$at_srcdir/ofproto-dpif.at:4180: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4180"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4181"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4180"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133432,30 +133915,30 @@
 
 # Delete the inserted flows
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4186: ovs-ofctl del-flows br0 \"in_port=1\""
-at_fn_check_prepare_trace "ofproto-dpif.at:4186"
+$as_echo "$at_srcdir/ofproto-dpif.at:4185: ovs-ofctl del-flows br0 \"in_port=1\""
+at_fn_check_prepare_trace "ofproto-dpif.at:4185"
 ( $at_check_trace; ovs-ofctl del-flows br0 "in_port=1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4186"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4185"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4187: ovs-ofctl del-flows br0 \"in_port=2\""
-at_fn_check_prepare_trace "ofproto-dpif.at:4187"
+$as_echo "$at_srcdir/ofproto-dpif.at:4186: ovs-ofctl del-flows br0 \"in_port=2\""
+at_fn_check_prepare_trace "ofproto-dpif.at:4186"
 ( $at_check_trace; ovs-ofctl del-flows br0 "in_port=2"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4187"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4186"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133468,15 +133951,15 @@
 
 # Test command: ofproto/trace odp_flow
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4194: ovs-appctl ofproto/trace \"\$odp_flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$odp_flow\"" "ofproto-dpif.at:4194"
+$as_echo "$at_srcdir/ofproto-dpif.at:4193: ovs-appctl ofproto/trace \"\$odp_flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$odp_flow\"" "ofproto-dpif.at:4193"
 ( $at_check_trace; ovs-appctl ofproto/trace "$odp_flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4194"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4193"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133484,17 +133967,17 @@
 
 # Check for no MAC learning entry
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4196: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4196"
+$as_echo "$at_srcdir/ofproto-dpif.at:4195: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4195"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/[0-9]\{1,\}$/?/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo " port  VLAN  MAC                Age
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4196"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4195"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133503,15 +133986,15 @@
 
 # Test command: ofproto/trace br_name br_flow
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4201: ovs-appctl ofproto/trace br0 \"\$br_flow\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$br_flow\"" "ofproto-dpif.at:4201"
+$as_echo "$at_srcdir/ofproto-dpif.at:4200: ovs-appctl ofproto/trace br0 \"\$br_flow\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$br_flow\"" "ofproto-dpif.at:4200"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "$br_flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4201"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133519,17 +134002,17 @@
 
 # Check for no MAC learning entry
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4203: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4203"
+$as_echo "$at_srcdir/ofproto-dpif.at:4202: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4202"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/[0-9]\{1,\}$/?/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo " port  VLAN  MAC                Age
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4203"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4202"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133538,15 +134021,15 @@
 
 # Test command: ofproto/trace odp_flow -generate
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4208: ovs-appctl ofproto/trace \"\$odp_flow\" -generate"
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$odp_flow\" -generate" "ofproto-dpif.at:4208"
+$as_echo "$at_srcdir/ofproto-dpif.at:4207: ovs-appctl ofproto/trace \"\$odp_flow\" -generate"
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$odp_flow\" -generate" "ofproto-dpif.at:4207"
 ( $at_check_trace; ovs-appctl ofproto/trace "$odp_flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4208"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4207"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133554,10 +134037,10 @@
 
 # Check for the MAC learning entry
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4210: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4210"
+$as_echo "$at_srcdir/ofproto-dpif.at:4209: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4209"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/[0-9]\{1,\}$/?/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -133565,7 +134048,7 @@
     3     0  50:54:00:00:00:05    ?
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4210"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4209"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133574,19 +134057,19 @@
 
 # Test command: ofproto/trace dp_name odp_flow -generate
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4216: ovs-appctl ofproto/trace ovs-dummy \\
+$as_echo "$at_srcdir/ofproto-dpif.at:4215: ovs-appctl ofproto/trace ovs-dummy \\
   \"in_port(1),eth(src=50:54:00:00:00:06,dst=50:54:00:00:00:05)\" \\
   -generate"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4216"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4215"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy \
   "in_port(1),eth(src=50:54:00:00:00:06,dst=50:54:00:00:00:05)" \
   -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4216"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4215"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133594,10 +134077,10 @@
 
 # Check for both MAC learning entries
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4220: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4220"
+$as_echo "$at_srcdir/ofproto-dpif.at:4219: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4219"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/[0-9]\{1,\}$/?/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -133606,7 +134089,7 @@
     1     0  50:54:00:00:00:06    ?
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133615,19 +134098,19 @@
 
 # Test command: ofproto/trace br_name br_flow -generate
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4227: ovs-appctl ofproto/trace br0 \\
+$as_echo "$at_srcdir/ofproto-dpif.at:4226: ovs-appctl ofproto/trace br0 \\
   \"in_port=2,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:06\" \\
   -generate"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4227"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4226"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 \
   "in_port=2,dl_src=50:54:00:00:00:07,dl_dst=50:54:00:00:00:06" \
   -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4227"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4226"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133635,10 +134118,10 @@
 
 # Check for both MAC learning entries.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4231: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4231"
+$as_echo "$at_srcdir/ofproto-dpif.at:4230: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4230"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/[0-9]\{1,\}$/?/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -133648,7 +134131,7 @@
     2     0  50:54:00:00:00:07    ?
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4231"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4230"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133662,19 +134145,19 @@
 
 # Construct the MAC learning table
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4244: ovs-appctl ofproto/trace ovs-dummy \\
+$as_echo "$at_srcdir/ofproto-dpif.at:4243: ovs-appctl ofproto/trace ovs-dummy \\
   \"in_port(1),eth(src=50:54:00:00:00:01,dst=ff:ff:ff:ff:ff:ff)\" \\
   -generate"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4244"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4243"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy \
   "in_port(1),eth(src=50:54:00:00:00:01,dst=ff:ff:ff:ff:ff:ff)" \
   -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4244"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4243"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133683,19 +134166,19 @@
 
 # Construct the MAC learning table
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4249: ovs-appctl ofproto/trace ovs-dummy \\
+$as_echo "$at_srcdir/ofproto-dpif.at:4248: ovs-appctl ofproto/trace ovs-dummy \\
   \"in_port(2),eth(src=50:54:00:00:00:02,dst=ff:ff:ff:ff:ff:ff)\" \\
   -generate"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4249"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4248"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy \
   "in_port(2),eth(src=50:54:00:00:00:02,dst=ff:ff:ff:ff:ff:ff)" \
   -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4249"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4248"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133704,44 +134187,44 @@
 
 # Test command: ofproto/trace odp_flow packet
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4254: ovs-appctl ofproto/trace \\
+$as_echo "$at_srcdir/ofproto-dpif.at:4253: ovs-appctl ofproto/trace \\
   \"in_port(1),skb_priority(1),skb_mark(2)\" \"\$pkt1to2\""
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4254"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4253"
 ( $at_check_trace; ovs-appctl ofproto/trace \
   "in_port(1),skb_priority(1),skb_mark(2)" "$pkt1to2"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4254"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4253"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4256: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4256"
+$as_echo "$at_srcdir/ofproto-dpif.at:4255: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4255"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4256"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4255"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4259: head -n 2 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4259"
+$as_echo "$at_srcdir/ofproto-dpif.at:4258: head -n 2 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4258"
 ( $at_check_trace; head -n 2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -133749,7 +134232,7 @@
 Flow: pkt_mark=0x2,skb_priority=0x1,arp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:01,dl_dst=50:54:00:00:00:02,arp_spa=0.0.0.0,arp_tpa=0.0.0.0,arp_op=0,arp_sha=00:00:00:00:00:00,arp_tha=00:00:00:00:00:00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4259"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4258"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133758,44 +134241,44 @@
 
 # Test command: ofproto/trace dp_name odp_flow packet
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4265: ovs-appctl ofproto/trace ovs-dummy \\
+$as_echo "$at_srcdir/ofproto-dpif.at:4264: ovs-appctl ofproto/trace ovs-dummy \\
   \"in_port(1),skb_priority(1),skb_mark(2)\" \"\$pkt1to2\""
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4265"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4264"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy \
   "in_port(1),skb_priority(1),skb_mark(2)" "$pkt1to2"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4265"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4264"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4267: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4267"
+$as_echo "$at_srcdir/ofproto-dpif.at:4266: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4266"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4267"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4270: head -n 2 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4270"
+$as_echo "$at_srcdir/ofproto-dpif.at:4269: head -n 2 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4269"
 ( $at_check_trace; head -n 2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -133803,7 +134286,7 @@
 Flow: pkt_mark=0x2,skb_priority=0x1,arp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:01,dl_dst=50:54:00:00:00:02,arp_spa=0.0.0.0,arp_tpa=0.0.0.0,arp_op=0,arp_sha=00:00:00:00:00:00,arp_tha=00:00:00:00:00:00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4270"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4269"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133812,44 +134295,44 @@
 
 # Test command: ofproto/trace br_name br_flow packet
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4276: ovs-appctl ofproto/trace br0 \\
+$as_echo "$at_srcdir/ofproto-dpif.at:4275: ovs-appctl ofproto/trace br0 \\
   \"in_port=2,skb_priority=2,pkt_mark=1\" \"\$pkt2to1\""
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4276"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4275"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 \
   "in_port=2,skb_priority=2,pkt_mark=1" "$pkt2to1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4276"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4278: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4278"
+$as_echo "$at_srcdir/ofproto-dpif.at:4277: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4277"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4278"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4281: head -n 2 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4281"
+$as_echo "$at_srcdir/ofproto-dpif.at:4280: head -n 2 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4280"
 ( $at_check_trace; head -n 2 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -133857,7 +134340,7 @@
 Flow: pkt_mark=0x1,skb_priority=0x2,arp,in_port=2,vlan_tci=0x0000,dl_src=50:54:00:00:00:02,dl_dst=50:54:00:00:00:01,arp_spa=0.0.0.0,arp_tpa=0.0.0.0,arp_op=0,arp_sha=00:00:00:00:00:00,arp_tha=00:00:00:00:00:00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4281"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4280"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133865,45 +134348,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4286: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:4286"
+$as_echo "$at_srcdir/ofproto-dpif.at:4285: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:4285"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4286"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4285"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4286: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4286"
+$as_echo "$at_srcdir/ofproto-dpif.at:4285: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4285"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4286"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4285"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4286: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4286"
+$as_echo "$at_srcdir/ofproto-dpif.at:4285: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4285"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4286"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4285"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -133913,13 +134396,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_857
-#AT_START_858
-at_fn_group_banner 858 'ofproto-dpif.at:4290' \
+#AT_STOP_859
+#AT_START_860
+at_fn_group_banner 860 'ofproto-dpif.at:4289' \
   "ofproto-dpif - ofproto/trace command 2" "         " 52
 at_xfail=no
 (
-  $as_echo "858. $at_setup_line: testing $at_desc ..."
+  $as_echo "860. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -133929,29 +134412,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4291: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4291"
+$as_echo "$at_srcdir/ofproto-dpif.at:4290: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4290"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4291"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4290"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4291: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4291"
+$as_echo "$at_srcdir/ofproto-dpif.at:4290: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4290"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4291"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4290"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -133961,49 +134444,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4291: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4290: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4291"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4290"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4291"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4290"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4291: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:4291"
+$as_echo "$at_srcdir/ofproto-dpif.at:4290: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:4290"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4291"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4290"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4291: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:4291"
+$as_echo "$at_srcdir/ofproto-dpif.at:4290: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:4290"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4291"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4290"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -134015,14 +134498,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4291: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4290: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4291"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4290"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -134030,12 +134513,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4291"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4290"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134044,15 +134527,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4291: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:4291"
+$as_echo "$at_srcdir/ofproto-dpif.at:4290: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:4290"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4291"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4290"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134072,25 +134555,25 @@
 
 # Test incorrect command: ofproto/trace wrong_name odp_flow [-generate|packet]
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4302: ovs-appctl ofproto/trace wrong_name \"\$odp_flow\" "
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace wrong_name \"$odp_flow\" " "ofproto-dpif.at:4302"
+$as_echo "$at_srcdir/ofproto-dpif.at:4301: ovs-appctl ofproto/trace wrong_name \"\$odp_flow\" "
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace wrong_name \"$odp_flow\" " "ofproto-dpif.at:4301"
 ( $at_check_trace; ovs-appctl ofproto/trace wrong_name "$odp_flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4302"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4302: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4302"
+$as_echo "$at_srcdir/ofproto-dpif.at:4301: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4301"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134098,31 +134581,31 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4302"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4302: ovs-appctl ofproto/trace wrong_name \"\$odp_flow\" \"\$generate\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace wrong_name \"$odp_flow\" \"$generate\"" "ofproto-dpif.at:4302"
+$as_echo "$at_srcdir/ofproto-dpif.at:4301: ovs-appctl ofproto/trace wrong_name \"\$odp_flow\" \"\$generate\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace wrong_name \"$odp_flow\" \"$generate\"" "ofproto-dpif.at:4301"
 ( $at_check_trace; ovs-appctl ofproto/trace wrong_name "$odp_flow" "$generate"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4302"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4302: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4302"
+$as_echo "$at_srcdir/ofproto-dpif.at:4301: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4301"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134130,31 +134613,31 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4302"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4302: ovs-appctl ofproto/trace wrong_name \"\$odp_flow\" \"\$pkt\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace wrong_name \"$odp_flow\" \"$pkt\"" "ofproto-dpif.at:4302"
+$as_echo "$at_srcdir/ofproto-dpif.at:4301: ovs-appctl ofproto/trace wrong_name \"\$odp_flow\" \"\$pkt\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace wrong_name \"$odp_flow\" \"$pkt\"" "ofproto-dpif.at:4301"
 ( $at_check_trace; ovs-appctl ofproto/trace wrong_name "$odp_flow" "$pkt"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4302"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4302: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4302"
+$as_echo "$at_srcdir/ofproto-dpif.at:4301: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4301"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134162,7 +134645,7 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4302"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134171,25 +134654,25 @@
 
 # Test incorrect command: ofproto/trace empty_string odp_flow [-generate|packet]
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4315: ovs-appctl ofproto/trace \"\" \"\$odp_flow\" "
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"\" \"$odp_flow\" " "ofproto-dpif.at:4315"
+$as_echo "$at_srcdir/ofproto-dpif.at:4314: ovs-appctl ofproto/trace \"\" \"\$odp_flow\" "
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"\" \"$odp_flow\" " "ofproto-dpif.at:4314"
 ( $at_check_trace; ovs-appctl ofproto/trace "" "$odp_flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4315"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4314"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4315: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4315"
+$as_echo "$at_srcdir/ofproto-dpif.at:4314: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4314"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134197,31 +134680,31 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4315"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4314"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4315: ovs-appctl ofproto/trace \"\" \"\$odp_flow\" \"\$generate\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"\" \"$odp_flow\" \"$generate\"" "ofproto-dpif.at:4315"
+$as_echo "$at_srcdir/ofproto-dpif.at:4314: ovs-appctl ofproto/trace \"\" \"\$odp_flow\" \"\$generate\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"\" \"$odp_flow\" \"$generate\"" "ofproto-dpif.at:4314"
 ( $at_check_trace; ovs-appctl ofproto/trace "" "$odp_flow" "$generate"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4315"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4314"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4315: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4315"
+$as_echo "$at_srcdir/ofproto-dpif.at:4314: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4314"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134229,31 +134712,31 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4315"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4314"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4315: ovs-appctl ofproto/trace \"\" \"\$odp_flow\" \"\$pkt\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"\" \"$odp_flow\" \"$pkt\"" "ofproto-dpif.at:4315"
+$as_echo "$at_srcdir/ofproto-dpif.at:4314: ovs-appctl ofproto/trace \"\" \"\$odp_flow\" \"\$pkt\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"\" \"$odp_flow\" \"$pkt\"" "ofproto-dpif.at:4314"
 ( $at_check_trace; ovs-appctl ofproto/trace "" "$odp_flow" "$pkt"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4315"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4314"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4315: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4315"
+$as_echo "$at_srcdir/ofproto-dpif.at:4314: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4314"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134261,7 +134744,7 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4315"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4314"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134270,25 +134753,25 @@
 
 # Test incorrect command: ofproto/trace nonexist_dp_name odp_flow [-generate|packet]
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4328: ovs-appctl ofproto/trace ovs-system \"\$odp_flow\" "
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-system \"$odp_flow\" " "ofproto-dpif.at:4328"
+$as_echo "$at_srcdir/ofproto-dpif.at:4327: ovs-appctl ofproto/trace ovs-system \"\$odp_flow\" "
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-system \"$odp_flow\" " "ofproto-dpif.at:4327"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-system "$odp_flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4328"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4327"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4328: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4328"
+$as_echo "$at_srcdir/ofproto-dpif.at:4327: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4327"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134296,31 +134779,31 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4328"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4327"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4328: ovs-appctl ofproto/trace ovs-system \"\$odp_flow\" \"\$generate\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-system \"$odp_flow\" \"$generate\"" "ofproto-dpif.at:4328"
+$as_echo "$at_srcdir/ofproto-dpif.at:4327: ovs-appctl ofproto/trace ovs-system \"\$odp_flow\" \"\$generate\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-system \"$odp_flow\" \"$generate\"" "ofproto-dpif.at:4327"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-system "$odp_flow" "$generate"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4328"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4327"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4328: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4328"
+$as_echo "$at_srcdir/ofproto-dpif.at:4327: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4327"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134328,31 +134811,31 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4328"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4327"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4328: ovs-appctl ofproto/trace ovs-system \"\$odp_flow\" \"\$pkt\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-system \"$odp_flow\" \"$pkt\"" "ofproto-dpif.at:4328"
+$as_echo "$at_srcdir/ofproto-dpif.at:4327: ovs-appctl ofproto/trace ovs-system \"\$odp_flow\" \"\$pkt\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-system \"$odp_flow\" \"$pkt\"" "ofproto-dpif.at:4327"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-system "$odp_flow" "$pkt"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4328"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4327"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4328: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4328"
+$as_echo "$at_srcdir/ofproto-dpif.at:4327: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4327"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134360,7 +134843,7 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4328"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4327"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134369,25 +134852,25 @@
 
 # Test incorrect command: ofproto/trace br_name odp_flow [-generate|packet]
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4341: ovs-appctl ofproto/trace br0 \"\$odp_flow\" "
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$odp_flow\" " "ofproto-dpif.at:4341"
+$as_echo "$at_srcdir/ofproto-dpif.at:4340: ovs-appctl ofproto/trace br0 \"\$odp_flow\" "
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$odp_flow\" " "ofproto-dpif.at:4340"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "$odp_flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4341"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4340"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4341: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4341"
+$as_echo "$at_srcdir/ofproto-dpif.at:4340: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4340"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134395,31 +134878,31 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4341"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4340"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4341: ovs-appctl ofproto/trace br0 \"\$odp_flow\" \"\$generate\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$odp_flow\" \"$generate\"" "ofproto-dpif.at:4341"
+$as_echo "$at_srcdir/ofproto-dpif.at:4340: ovs-appctl ofproto/trace br0 \"\$odp_flow\" \"\$generate\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$odp_flow\" \"$generate\"" "ofproto-dpif.at:4340"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "$odp_flow" "$generate"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4341"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4340"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4341: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4341"
+$as_echo "$at_srcdir/ofproto-dpif.at:4340: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4340"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134427,31 +134910,31 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4341"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4340"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4341: ovs-appctl ofproto/trace br0 \"\$odp_flow\" \"\$pkt\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$odp_flow\" \"$pkt\"" "ofproto-dpif.at:4341"
+$as_echo "$at_srcdir/ofproto-dpif.at:4340: ovs-appctl ofproto/trace br0 \"\$odp_flow\" \"\$pkt\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 \"$odp_flow\" \"$pkt\"" "ofproto-dpif.at:4340"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 "$odp_flow" "$pkt"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4341"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4340"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4341: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4341"
+$as_echo "$at_srcdir/ofproto-dpif.at:4340: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4340"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134459,7 +134942,7 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4341"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4340"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134468,25 +134951,25 @@
 
 # Test incorrect command: ofproto/trace dp_name br_flow [-generate|packet]
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4354: ovs-appctl ofproto/trace ovs-dummy \"\$br_flow\" "
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$br_flow\" " "ofproto-dpif.at:4354"
+$as_echo "$at_srcdir/ofproto-dpif.at:4353: ovs-appctl ofproto/trace ovs-dummy \"\$br_flow\" "
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$br_flow\" " "ofproto-dpif.at:4353"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$br_flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4354"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4353"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4354: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4354"
+$as_echo "$at_srcdir/ofproto-dpif.at:4353: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4353"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134494,31 +134977,31 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4354"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4353"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4354: ovs-appctl ofproto/trace ovs-dummy \"\$br_flow\" \"\$generate\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$br_flow\" \"$generate\"" "ofproto-dpif.at:4354"
+$as_echo "$at_srcdir/ofproto-dpif.at:4353: ovs-appctl ofproto/trace ovs-dummy \"\$br_flow\" \"\$generate\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$br_flow\" \"$generate\"" "ofproto-dpif.at:4353"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$br_flow" "$generate"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4354"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4353"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4354: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4354"
+$as_echo "$at_srcdir/ofproto-dpif.at:4353: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4353"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134526,31 +135009,31 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4354"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4353"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4354: ovs-appctl ofproto/trace ovs-dummy \"\$br_flow\" \"\$pkt\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$br_flow\" \"$pkt\"" "ofproto-dpif.at:4354"
+$as_echo "$at_srcdir/ofproto-dpif.at:4353: ovs-appctl ofproto/trace ovs-dummy \"\$br_flow\" \"\$pkt\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$br_flow\" \"$pkt\"" "ofproto-dpif.at:4353"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$br_flow" "$pkt"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4354"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4353"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4354: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4354"
+$as_echo "$at_srcdir/ofproto-dpif.at:4353: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4353"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134558,7 +135041,7 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4354"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4353"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134567,25 +135050,25 @@
 
 # Test incorrect command: ofproto/trace br_flow [-generate|packet]
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4367: ovs-appctl ofproto/trace \"\$br_flow\" "
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$br_flow\" " "ofproto-dpif.at:4367"
+$as_echo "$at_srcdir/ofproto-dpif.at:4366: ovs-appctl ofproto/trace \"\$br_flow\" "
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$br_flow\" " "ofproto-dpif.at:4366"
 ( $at_check_trace; ovs-appctl ofproto/trace "$br_flow"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4367"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4366"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4367: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4367"
+$as_echo "$at_srcdir/ofproto-dpif.at:4366: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4366"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134593,31 +135076,31 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4367"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4366"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4367: ovs-appctl ofproto/trace \"\$br_flow\" \"\$generate\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$br_flow\" \"$generate\"" "ofproto-dpif.at:4367"
+$as_echo "$at_srcdir/ofproto-dpif.at:4366: ovs-appctl ofproto/trace \"\$br_flow\" \"\$generate\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$br_flow\" \"$generate\"" "ofproto-dpif.at:4366"
 ( $at_check_trace; ovs-appctl ofproto/trace "$br_flow" "$generate"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4367"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4366"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4367: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4367"
+$as_echo "$at_srcdir/ofproto-dpif.at:4366: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4366"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134625,31 +135108,31 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4367"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4366"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4367: ovs-appctl ofproto/trace \"\$br_flow\" \"\$pkt\""
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$br_flow\" \"$pkt\"" "ofproto-dpif.at:4367"
+$as_echo "$at_srcdir/ofproto-dpif.at:4366: ovs-appctl ofproto/trace \"\$br_flow\" \"\$pkt\""
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace \"$br_flow\" \"$pkt\"" "ofproto-dpif.at:4366"
 ( $at_check_trace; ovs-appctl ofproto/trace "$br_flow" "$pkt"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4367"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4366"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4367: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4367"
+$as_echo "$at_srcdir/ofproto-dpif.at:4366: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4366"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134657,7 +135140,7 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4367"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4366"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134666,27 +135149,27 @@
 
 # Test incorrect command: ofproto/trace dp_name odp_flow garbage_option
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4380: ovs-appctl ofproto/trace \\
+$as_echo "$at_srcdir/ofproto-dpif.at:4379: ovs-appctl ofproto/trace \\
   ovs-dummy \"\$odp_flow\" garbage_option"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4380"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4379"
 ( $at_check_trace; ovs-appctl ofproto/trace \
   ovs-dummy "$odp_flow" garbage_option
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4380"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4379"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4383: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4383"
+$as_echo "$at_srcdir/ofproto-dpif.at:4382: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4382"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134694,7 +135177,7 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4383"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4382"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134703,27 +135186,27 @@
 
 # Test incorrect command: ofproto/trace with 4 arguments
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4389: ovs-appctl ofproto/trace \\
+$as_echo "$at_srcdir/ofproto-dpif.at:4388: ovs-appctl ofproto/trace \\
   arg1, arg2, arg3, arg4"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4389"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4388"
 ( $at_check_trace; ovs-appctl ofproto/trace \
   arg1, arg2, arg3, arg4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4389"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4388"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4391: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4391"
+$as_echo "$at_srcdir/ofproto-dpif.at:4390: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4390"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134731,7 +135214,7 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4391"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4390"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134740,25 +135223,25 @@
 
 # Test incorrect command: ofproto/trace with 0 argument
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4397: ovs-appctl ofproto/trace "
-at_fn_check_prepare_trace "ofproto-dpif.at:4397"
+$as_echo "$at_srcdir/ofproto-dpif.at:4396: ovs-appctl ofproto/trace "
+at_fn_check_prepare_trace "ofproto-dpif.at:4396"
 ( $at_check_trace; ovs-appctl ofproto/trace
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4397"
+at_fn_check_status 2 $at_status "$at_srcdir/ofproto-dpif.at:4396"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4398: tail -2 stderr"
-at_fn_check_prepare_trace "ofproto-dpif.at:4398"
+$as_echo "$at_srcdir/ofproto-dpif.at:4397: tail -2 stderr"
+at_fn_check_prepare_trace "ofproto-dpif.at:4397"
 ( $at_check_trace; tail -2 stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -134766,7 +135249,7 @@
 ovs-appctl: ovs-vswitchd: server returned an error
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4398"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4397"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134774,45 +135257,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4403: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:4403"
+$as_echo "$at_srcdir/ofproto-dpif.at:4402: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:4402"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4402"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4403: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4403"
+$as_echo "$at_srcdir/ofproto-dpif.at:4402: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4402"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4402"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4403: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4403"
+$as_echo "$at_srcdir/ofproto-dpif.at:4402: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4402"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4402"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134822,13 +135305,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_858
-#AT_START_859
-at_fn_group_banner 859 'ofproto-dpif.at:4407' \
+#AT_STOP_860
+#AT_START_861
+at_fn_group_banner 861 'ofproto-dpif.at:4406' \
   "ofproto-dpif - ofproto/trace from dpctl output" " " 52
 at_xfail=no
 (
-  $as_echo "859. $at_setup_line: testing $at_desc ..."
+  $as_echo "861. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -134838,29 +135321,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4408: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4408"
+$as_echo "$at_srcdir/ofproto-dpif.at:4407: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4407"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4408"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4407"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4408: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4408"
+$as_echo "$at_srcdir/ofproto-dpif.at:4407: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4407"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4408"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4407"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -134870,49 +135353,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4408: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4407: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4408"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4407"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4408"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4407"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4408: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:4408"
+$as_echo "$at_srcdir/ofproto-dpif.at:4407: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:4407"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4408"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4407"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4408: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:4408"
+$as_echo "$at_srcdir/ofproto-dpif.at:4407: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:4407"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4408"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4407"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -134924,14 +135407,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4408: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4407: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4408"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4407"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -134939,12 +135422,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4408"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4407"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134953,17 +135436,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4408: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --     set Open_vSwitch . other_config:max-idle=10000 \\
+$as_echo "$at_srcdir/ofproto-dpif.at:4407: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --     set Open_vSwitch . other_config:max-idle=10000 \\
     -- add-port br0 p1 -- set Interface p1 type=dummy "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4408"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4407"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --     set Open_vSwitch . other_config:max-idle=10000 \
     -- add-port br0 p1 -- set Interface p1 type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4408"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4407"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134972,15 +135455,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4412: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:4412"
+$as_echo "$at_srcdir/ofproto-dpif.at:4411: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:4411"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4412"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4411"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -134988,15 +135471,15 @@
 
 ovs-appctl revalidator/wait
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4414: ovs-appctl dpif/dump-flows -m br0 | sed 's/, packets.*\$//' > dp_flows1.txt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4414"
+$as_echo "$at_srcdir/ofproto-dpif.at:4413: ovs-appctl dpif/dump-flows -m br0 | sed 's/, packets.*\$//' > dp_flows1.txt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4413"
 ( $at_check_trace; ovs-appctl dpif/dump-flows -m br0 | sed 's/, packets.*$//' > dp_flows1.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4414"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4413"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135005,10 +135488,10 @@
 
 odp_flow=`cat dp_flows1.txt`
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4417: ovs-appctl ofproto/trace \"\$odp_flow\" | sed 's/\\([Ff]low:\\).*/\\1 /'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4417"
+$as_echo "$at_srcdir/ofproto-dpif.at:4416: ovs-appctl ofproto/trace \"\$odp_flow\" | sed 's/\\([Ff]low:\\).*/\\1 /'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4416"
 ( $at_check_trace; ovs-appctl ofproto/trace "$odp_flow" | sed 's/\([Ff]low:\).*/\1 /'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -135024,7 +135507,7 @@
 Datapath actions: drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4417"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4416"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135034,15 +135517,15 @@
 ovs-appctl upcall/disable-megaflows
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4433: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:4433"
+$as_echo "$at_srcdir/ofproto-dpif.at:4432: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:4432"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4433"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4432"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135050,15 +135533,15 @@
 
 ovs-appctl revalidator/wait
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4435: ovs-appctl dpif/dump-flows -m br0 | sed 's/, packets.*\$//' > dp_flows2.txt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4435"
+$as_echo "$at_srcdir/ofproto-dpif.at:4434: ovs-appctl dpif/dump-flows -m br0 | sed 's/, packets.*\$//' > dp_flows2.txt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4434"
 ( $at_check_trace; ovs-appctl dpif/dump-flows -m br0 | sed 's/, packets.*$//' > dp_flows2.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4435"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4434"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135067,10 +135550,10 @@
 
 odp_flow=`cat dp_flows2.txt`
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4438: ovs-appctl ofproto/trace \"\$odp_flow\" | sed 's/\\([Ff]low:\\).*/\\1 /'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4438"
+$as_echo "$at_srcdir/ofproto-dpif.at:4437: ovs-appctl ofproto/trace \"\$odp_flow\" | sed 's/\\([Ff]low:\\).*/\\1 /'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4437"
 ( $at_check_trace; ovs-appctl ofproto/trace "$odp_flow" | sed 's/\([Ff]low:\).*/\1 /'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -135086,7 +135569,7 @@
 Datapath actions: drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4438"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4437"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135094,45 +135577,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4451: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:4451"
+$as_echo "$at_srcdir/ofproto-dpif.at:4450: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:4450"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4451"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4450"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4451: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4451"
+$as_echo "$at_srcdir/ofproto-dpif.at:4450: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4450"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4451"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4450"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4451: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4451"
+$as_echo "$at_srcdir/ofproto-dpif.at:4450: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4450"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4451"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4450"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135142,13 +135625,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_859
-#AT_START_860
-at_fn_group_banner 860 'ofproto-dpif.at:4454' \
+#AT_STOP_861
+#AT_START_862
+at_fn_group_banner 862 'ofproto-dpif.at:4453' \
   "ofproto-dpif - ofproto/trace-packet-out" "        " 52
 at_xfail=no
 (
-  $as_echo "860. $at_setup_line: testing $at_desc ..."
+  $as_echo "862. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -135158,29 +135641,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4455: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4455"
+$as_echo "$at_srcdir/ofproto-dpif.at:4454: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4454"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4454"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4455: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4455"
+$as_echo "$at_srcdir/ofproto-dpif.at:4454: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4454"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4454"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -135190,49 +135673,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4455: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4454: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4455"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4454"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4454"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4455: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:4455"
+$as_echo "$at_srcdir/ofproto-dpif.at:4454: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:4454"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4454"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4455: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:4455"
+$as_echo "$at_srcdir/ofproto-dpif.at:4454: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:4454"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4454"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -135244,14 +135727,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4455: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4454: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4455"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4454"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -135259,12 +135742,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4454"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135273,15 +135756,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4455: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:4455"
+$as_echo "$at_srcdir/ofproto-dpif.at:4454: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:4454"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4454"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135299,15 +135782,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4462: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:4462"
+$as_echo "$at_srcdir/ofproto-dpif.at:4461: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:4461"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4462"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4461"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135315,32 +135798,32 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4464: ovs-appctl ofproto/trace-packet-out br0 in_port=1 'mod_vlan_vid:123,resubmit(,0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:4464"
+$as_echo "$at_srcdir/ofproto-dpif.at:4463: ovs-appctl ofproto/trace-packet-out br0 in_port=1 'mod_vlan_vid:123,resubmit(,0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:4463"
 ( $at_check_trace; ovs-appctl ofproto/trace-packet-out br0 in_port=1 'mod_vlan_vid:123,resubmit(,0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4464"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4463"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4465: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:4465"
+$as_echo "$at_srcdir/ofproto-dpif.at:4464: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:4464"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: push_vlan(vid=123,pcp=0),2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4465"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4464"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135348,45 +135831,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4469: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:4469"
+$as_echo "$at_srcdir/ofproto-dpif.at:4468: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:4468"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4469"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4468"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4469: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4469"
+$as_echo "$at_srcdir/ofproto-dpif.at:4468: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4468"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4469"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4468"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4469: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4469"
+$as_echo "$at_srcdir/ofproto-dpif.at:4468: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4468"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4469"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4468"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135396,13 +135879,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_860
-#AT_START_861
-at_fn_group_banner 861 'ofproto-dpif.at:4484' \
+#AT_STOP_862
+#AT_START_863
+at_fn_group_banner 863 'ofproto-dpif.at:4483' \
   "ofproto-dpif - MAC learning" "                    " 52
 at_xfail=no
 (
-  $as_echo "861. $at_setup_line: testing $at_desc ..."
+  $as_echo "863. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -135412,29 +135895,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4485: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4485"
+$as_echo "$at_srcdir/ofproto-dpif.at:4484: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4484"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4485: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4485"
+$as_echo "$at_srcdir/ofproto-dpif.at:4484: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4484"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -135444,49 +135927,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4485: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4484: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4485"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4484"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4485: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:4485"
+$as_echo "$at_srcdir/ofproto-dpif.at:4484: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:4484"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4484"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4485: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:4485"
+$as_echo "$at_srcdir/ofproto-dpif.at:4484: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:4484"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4484"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -135498,14 +135981,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4485: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4484: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4485"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4484"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -135513,12 +135996,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4484"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135527,15 +136010,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4485: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 fail-mode=standalone "
-at_fn_check_prepare_trace "ofproto-dpif.at:4485"
+$as_echo "$at_srcdir/ofproto-dpif.at:4484: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 fail-mode=standalone "
+at_fn_check_prepare_trace "ofproto-dpif.at:4484"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 fail-mode=standalone
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4484"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135552,15 +136035,15 @@
 # Trace an ARP packet arriving on p3, to create a MAC learning entry.
 flow="in_port(3),eth(src=50:54:00:00:00:05,dst=ff:ff:ff:ff:ff:ff),$arp"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4491: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4491"
+$as_echo "$at_srcdir/ofproto-dpif.at:4490: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4490"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4491"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4490"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135569,15 +136052,15 @@
    actual=`tail -1 stdout | sed 's/Datapath actions: //'`
    expected="1,2,100"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4491: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4491"
+$as_echo "$at_srcdir/ofproto-dpif.at:4490: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4490"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4491"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4490"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135585,15 +136068,15 @@
 
    mv stdout expout
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4491: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4491"
+$as_echo "$at_srcdir/ofproto-dpif.at:4490: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4490"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4491"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4490"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135602,10 +136085,10 @@
 
 # Check for the MAC learning entry.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4498: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4498"
+$as_echo "$at_srcdir/ofproto-dpif.at:4497: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4497"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/[0-9]\{1,\}$/?/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -135613,7 +136096,7 @@
     3     0  50:54:00:00:00:05    ?
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4498"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4497"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135624,15 +136107,15 @@
 # (This will also learn a MAC.)
 flow="in_port(1),eth(src=50:54:00:00:00:06,dst=50:54:00:00:00:05),$arp"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4505: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4505"
+$as_echo "$at_srcdir/ofproto-dpif.at:4504: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4504"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4505"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4504"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135641,15 +136124,15 @@
    actual=`tail -1 stdout | sed 's/Datapath actions: //'`
    expected="3"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4505: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4505"
+$as_echo "$at_srcdir/ofproto-dpif.at:4504: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4504"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4505"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4504"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135657,15 +136140,15 @@
 
    mv stdout expout
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4505: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4505"
+$as_echo "$at_srcdir/ofproto-dpif.at:4504: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4504"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4505"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4504"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135674,10 +136157,10 @@
 
 # Check for both MAC learning entries.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4512: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4512"
+$as_echo "$at_srcdir/ofproto-dpif.at:4511: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4511"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/[0-9]\{1,\}$/?/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -135686,7 +136169,7 @@
     1     0  50:54:00:00:00:06    ?
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4512"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4511"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135696,15 +136179,15 @@
 # Trace a packet arrival that updates the first learned MAC entry.
 flow="in_port(2),eth(src=50:54:00:00:00:05,dst=ff:ff:ff:ff:ff:ff),$arp"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4519: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4519"
+$as_echo "$at_srcdir/ofproto-dpif.at:4518: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4518"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4519"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4518"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135713,15 +136196,15 @@
    actual=`tail -1 stdout | sed 's/Datapath actions: //'`
    expected="1,3,100"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4519: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4519"
+$as_echo "$at_srcdir/ofproto-dpif.at:4518: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4518"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4519"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4518"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135729,15 +136212,15 @@
 
    mv stdout expout
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4519: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4519"
+$as_echo "$at_srcdir/ofproto-dpif.at:4518: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4518"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4519"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4518"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135746,10 +136229,10 @@
 
 # Check that the MAC learning entry was updated.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4526: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4526"
+$as_echo "$at_srcdir/ofproto-dpif.at:4525: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4525"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/[0-9]\{1,\}$/?/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -135758,7 +136241,7 @@
     2     0  50:54:00:00:00:05    ?
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4526"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4525"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135767,19 +136250,19 @@
 
 # Add another bridge.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4533: ovs-vsctl \\
+$as_echo "$at_srcdir/ofproto-dpif.at:4532: ovs-vsctl \\
      -- add-br br1 \\
      -- set bridge br1 datapath-type=dummy"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4533"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4532"
 ( $at_check_trace; ovs-vsctl \
      -- add-br br1 \
      -- set bridge br1 datapath-type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4533"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4532"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135792,15 +136275,15 @@
 # Trace some packet arrivals in br1 to create MAC learning entries there too.
 flow="in_port(4),eth(src=50:54:00:00:00:06,dst=ff:ff:ff:ff:ff:ff),$arp"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4540: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4540"
+$as_echo "$at_srcdir/ofproto-dpif.at:4539: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4539"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4540"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4539"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135809,15 +136292,15 @@
    actual=`tail -1 stdout | sed 's/Datapath actions: //'`
    expected="5,101"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4540: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4540"
+$as_echo "$at_srcdir/ofproto-dpif.at:4539: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4539"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4540"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4539"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135825,15 +136308,15 @@
 
    mv stdout expout
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4540: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4540"
+$as_echo "$at_srcdir/ofproto-dpif.at:4539: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4539"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4540"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4539"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135841,15 +136324,15 @@
 
 flow="in_port(5),eth(src=50:54:00:00:00:07,dst=ff:ff:ff:ff:ff:ff),$arp"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4545: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4545"
+$as_echo "$at_srcdir/ofproto-dpif.at:4544: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4544"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4545"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4544"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135858,15 +136341,15 @@
    actual=`tail -1 stdout | sed 's/Datapath actions: //'`
    expected="4,101"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4545: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4545"
+$as_echo "$at_srcdir/ofproto-dpif.at:4544: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4544"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4545"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4544"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135874,15 +136357,15 @@
 
    mv stdout expout
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4545: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4545"
+$as_echo "$at_srcdir/ofproto-dpif.at:4544: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4544"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4545"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4544"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135891,10 +136374,10 @@
 
 # Check that the MAC learning entries were added.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4552: ovs-appctl fdb/show br1 | sed 's/[0-9]\\{1,\\}\$/?/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4552"
+$as_echo "$at_srcdir/ofproto-dpif.at:4551: ovs-appctl fdb/show br1 | sed 's/[0-9]\\{1,\\}\$/?/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4551"
 ( $at_check_trace; ovs-appctl fdb/show br1 | sed 's/[0-9]\{1,\}$/?/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -135903,7 +136386,7 @@
     5     0  50:54:00:00:00:07    ?
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4552"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4551"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135913,25 +136396,25 @@
 # Delete port p1 and see that its MAC learning entry disappeared, and
 # that the MAC learning entry for the same MAC was also deleted from br1.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4560: ovs-vsctl del-port p1"
-at_fn_check_prepare_trace "ofproto-dpif.at:4560"
+$as_echo "$at_srcdir/ofproto-dpif.at:4559: ovs-vsctl del-port p1"
+at_fn_check_prepare_trace "ofproto-dpif.at:4559"
 ( $at_check_trace; ovs-vsctl del-port p1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4560"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4559"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4561: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4561"
+$as_echo "$at_srcdir/ofproto-dpif.at:4560: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4560"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/[0-9]\{1,\}$/?/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -135939,17 +136422,17 @@
     2     0  50:54:00:00:00:05    ?
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4561"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4560"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4565: ovs-appctl fdb/show br1 | sed 's/[0-9]\\{1,\\}\$/?/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4565"
+$as_echo "$at_srcdir/ofproto-dpif.at:4564: ovs-appctl fdb/show br1 | sed 's/[0-9]\\{1,\\}\$/?/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4564"
 ( $at_check_trace; ovs-appctl fdb/show br1 | sed 's/[0-9]\{1,\}$/?/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -135957,7 +136440,7 @@
     5     0  50:54:00:00:00:07    ?
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4565"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4564"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -135965,45 +136448,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4570: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:4570"
+$as_echo "$at_srcdir/ofproto-dpif.at:4569: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:4569"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4570"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4569"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4570: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4570"
+$as_echo "$at_srcdir/ofproto-dpif.at:4569: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4569"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4570"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4569"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4570: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4570"
+$as_echo "$at_srcdir/ofproto-dpif.at:4569: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4569"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4570"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4569"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136013,13 +136496,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_861
-#AT_START_862
-at_fn_group_banner 862 'ofproto-dpif.at:4573' \
+#AT_STOP_863
+#AT_START_864
+at_fn_group_banner 864 'ofproto-dpif.at:4572' \
   "ofproto-dpif - MAC table overflow" "              " 52
 at_xfail=no
 (
-  $as_echo "862. $at_setup_line: testing $at_desc ..."
+  $as_echo "864. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -136029,29 +136512,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4574: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4574"
+$as_echo "$at_srcdir/ofproto-dpif.at:4573: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4573"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4573"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4574: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4574"
+$as_echo "$at_srcdir/ofproto-dpif.at:4573: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4573"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4573"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -136061,49 +136544,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4574: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4573: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4574"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4573"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4573"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4574: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:4574"
+$as_echo "$at_srcdir/ofproto-dpif.at:4573: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:4573"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4573"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4574: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:4574"
+$as_echo "$at_srcdir/ofproto-dpif.at:4573: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:4573"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4573"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -136115,14 +136598,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4574: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4573: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4574"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4573"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -136130,12 +136613,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4573"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136144,15 +136627,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4574: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 fail-mode=standalone other-config:mac-table-size=10 "
-at_fn_check_prepare_trace "ofproto-dpif.at:4574"
+$as_echo "$at_srcdir/ofproto-dpif.at:4573: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 fail-mode=standalone other-config:mac-table-size=10 "
+at_fn_check_prepare_trace "ofproto-dpif.at:4573"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 fail-mode=standalone other-config:mac-table-size=10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4574"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4573"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136167,15 +136650,15 @@
 arp='eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)'
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4580: ovs-appctl time/stop"
-at_fn_check_prepare_trace "ofproto-dpif.at:4580"
+$as_echo "$at_srcdir/ofproto-dpif.at:4579: ovs-appctl time/stop"
+at_fn_check_prepare_trace "ofproto-dpif.at:4579"
 ( $at_check_trace; ovs-appctl time/stop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4580"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4579"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136186,15 +136669,15 @@
 for i in 0 1 2 3 4 5 6 7 8 9; do
     flow="in_port(3),eth(src=50:54:00:00:00:0$i,dst=ff:ff:ff:ff:ff:ff),$arp"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4584: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4584"
+$as_echo "$at_srcdir/ofproto-dpif.at:4583: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4583"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4584"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4583"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136203,15 +136686,15 @@
    actual=`tail -1 stdout | sed 's/Datapath actions: //'`
    expected="1,2,100"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4584: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4584"
+$as_echo "$at_srcdir/ofproto-dpif.at:4583: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4583"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4584"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4583"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136219,15 +136702,15 @@
 
    mv stdout expout
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4584: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4584"
+$as_echo "$at_srcdir/ofproto-dpif.at:4583: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4583"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4584"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4583"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136238,10 +136721,10 @@
 
 # Check for the MAC learning entries.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4593: ovs-appctl fdb/show br0 | sed 's/ *[0-9]\\{1,\\}\$//' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4593"
+$as_echo "$at_srcdir/ofproto-dpif.at:4592: ovs-appctl fdb/show br0 | sed 's/ *[0-9]\\{1,\\}\$//' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4592"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/ *[0-9]\{1,\}$//' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -136258,7 +136741,7 @@
  port  VLAN  MAC                Age
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4593"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4592"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136268,15 +136751,15 @@
 # Trace another ARP packet on another MAC.
 flow="in_port(3),eth(src=50:54:00:00:00:10,dst=ff:ff:ff:ff:ff:ff),$arp"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4609: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4609"
+$as_echo "$at_srcdir/ofproto-dpif.at:4608: ovs-appctl ofproto/trace ovs-dummy \"\$flow\" -generate"
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow\" -generate" "ofproto-dpif.at:4608"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow" -generate
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4609"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4608"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136285,15 +136768,15 @@
    actual=`tail -1 stdout | sed 's/Datapath actions: //'`
    expected="1,2,100"
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4609: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4609"
+$as_echo "$at_srcdir/ofproto-dpif.at:4608: ovs-dpctl normalize-actions \"\$flow\" \"\$expected\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$expected\" " "ofproto-dpif.at:4608"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$expected"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4609"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4608"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136301,15 +136784,15 @@
 
    mv stdout expout
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4609: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
-at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4609"
+$as_echo "$at_srcdir/ofproto-dpif.at:4608: ovs-dpctl normalize-actions \"\$flow\" \"\$actual\" "
+at_fn_check_prepare_dynamic "ovs-dpctl normalize-actions \"$flow\" \"$actual\" " "ofproto-dpif.at:4608"
 ( $at_check_trace; ovs-dpctl normalize-actions "$flow" "$actual"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4609"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4608"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136318,10 +136801,10 @@
 
 # Check that the new one chased the oldest one out of the table.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4616: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4616"
+$as_echo "$at_srcdir/ofproto-dpif.at:4615: ovs-appctl fdb/show br0 | sed 's/[0-9]\\{1,\\}\$/?/' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4615"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/[0-9]\{1,\}$/?/' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -136338,52 +136821,52 @@
  port  VLAN  MAC                Age
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4616"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4615"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4630: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:4630"
+$as_echo "$at_srcdir/ofproto-dpif.at:4629: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:4629"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4630"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4629"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4630: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4630"
+$as_echo "$at_srcdir/ofproto-dpif.at:4629: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4629"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4630"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4629"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4630: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4630"
+$as_echo "$at_srcdir/ofproto-dpif.at:4629: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4629"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4630"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4629"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136393,13 +136876,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_862
-#AT_START_863
-at_fn_group_banner 863 'ofproto-dpif.at:4633' \
+#AT_STOP_864
+#AT_START_865
+at_fn_group_banner 865 'ofproto-dpif.at:4632' \
   "ofproto-dpif - MAC table overflow fairness" "     " 52
 at_xfail=no
 (
-  $as_echo "863. $at_setup_line: testing $at_desc ..."
+  $as_echo "865. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -136409,29 +136892,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4634: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4634"
+$as_echo "$at_srcdir/ofproto-dpif.at:4633: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:4633"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4634"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4633"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4634: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4634"
+$as_echo "$at_srcdir/ofproto-dpif.at:4633: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:4633"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4634"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4633"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -136441,49 +136924,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4634: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4633: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4634"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4633"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4634"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4633"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4634: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:4634"
+$as_echo "$at_srcdir/ofproto-dpif.at:4633: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:4633"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4634"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4633"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4634: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:4634"
+$as_echo "$at_srcdir/ofproto-dpif.at:4633: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:4633"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4634"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4633"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -136495,14 +136978,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4634: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:4633: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4634"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:4633"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -136510,12 +136993,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4634"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4633"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136524,15 +137007,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4634: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 fail-mode=standalone other-config:mac-table-size=10 "
-at_fn_check_prepare_trace "ofproto-dpif.at:4634"
+$as_echo "$at_srcdir/ofproto-dpif.at:4633: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 fail-mode=standalone other-config:mac-table-size=10 "
+at_fn_check_prepare_trace "ofproto-dpif.at:4633"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set bridge br0 fail-mode=standalone other-config:mac-table-size=10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4634"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4633"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136550,15 +137033,15 @@
 arp='eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)'
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4640: ovs-appctl time/stop"
-at_fn_check_prepare_trace "ofproto-dpif.at:4640"
+$as_echo "$at_srcdir/ofproto-dpif.at:4639: ovs-appctl time/stop"
+at_fn_check_prepare_trace "ofproto-dpif.at:4639"
 ( $at_check_trace; ovs-appctl time/stop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4640"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4639"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136575,10 +137058,10 @@
 
 # Check for the MAC learning entries.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4651: ovs-appctl fdb/show br0 | sed 's/ *[0-9]\\{1,\\}\$//' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4651"
+$as_echo "$at_srcdir/ofproto-dpif.at:4650: ovs-appctl fdb/show br0 | sed 's/ *[0-9]\\{1,\\}\$//' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4650"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/ *[0-9]\{1,\}$//' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -136595,7 +137078,7 @@
  port  VLAN  MAC                Age
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4651"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4650"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136619,10 +137102,10 @@
 # nodes, then the output below could change, but it would still follow the
 # rules explained above.)
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4682: ovs-appctl fdb/show br0 | sed 's/ *[0-9]\\{1,\\}\$//' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4682"
+$as_echo "$at_srcdir/ofproto-dpif.at:4681: ovs-appctl fdb/show br0 | sed 's/ *[0-9]\\{1,\\}\$//' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:4681"
 ( $at_check_trace; ovs-appctl fdb/show br0 | sed 's/ *[0-9]\{1,\}$//' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -136639,52 +137122,52 @@
  port  VLAN  MAC                Age
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4682"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4681"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4696: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:4696"
+$as_echo "$at_srcdir/ofproto-dpif.at:4695: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:4695"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4696"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4695"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4696: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4696"
+$as_echo "$at_srcdir/ofproto-dpif.at:4695: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4695"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4696"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4695"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:4696: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:4696"
+$as_echo "$at_srcdir/ofproto-dpif.at:4695: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:4695"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4696"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:4695"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136694,14 +137177,14 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_863
-#AT_START_864
-at_fn_group_banner 864 'ofproto-dpif.at:5026' \
+#AT_STOP_865
+#AT_START_866
+at_fn_group_banner 866 'ofproto-dpif.at:5025' \
   "ofproto-dpif - sFlow packet sampling - IPv4 collector" "" 52
 at_xfail=no
       test "$IS_WIN32" = "yes" && at_xfail=yes
 (
-  $as_echo "864. $at_setup_line: testing $at_desc ..."
+  $as_echo "866. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -136712,29 +137195,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5026"
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5025"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5026"
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5025"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -136744,49 +137227,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5026"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5025"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5026"
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5025"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5026"
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5025"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -136798,14 +137281,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5026"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5025"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -136813,12 +137296,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136827,15 +137310,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
-at_fn_check_prepare_trace "ofproto-dpif.at:5026"
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
+at_fn_check_prepare_trace "ofproto-dpif.at:5025"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136849,15 +137332,15 @@
 mv __cleanup cleanup
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:5026"
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:5025"
 ( $at_check_trace; ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -136890,15 +137373,15 @@
 
       ovs-appctl time/warp 3000 100
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5026"
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5025"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -136906,15 +137389,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5026"
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5025"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -136922,15 +137405,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5026"
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5025"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -136940,12 +137423,12 @@
   ovs-appctl -t test-sflow exit
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: sort sflow.log | \$EGREP 'HEADER|ERROR' | sed 's/ /\\
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: sort sflow.log | \$EGREP 'HEADER|ERROR' | sed 's/ /\\
 	/g'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5026"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5025"
 ( $at_check_trace; sort sflow.log | $EGREP 'HEADER|ERROR' | sed 's/ /\
 	/g'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -137051,7 +137534,7 @@
 	hdr=50-54-00-00-00-05-50-54-00-00-00-07-86-DD-67-00-00-00-00-00-0A-80-FE-80-00-00-00-00-00-00-00-00-00-00-00-00-00-01-FE-80-00-00-00-00-00-00-00-00-00-00-00-00-00-02-00-00-00-00-00-00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -137060,12 +137543,12 @@
 
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5026: sort sflow.log | \$EGREP 'IFCOUNTERS|ERROR|PORTNAME|OPENFLOWPORT' | head -18 | sed 's/ /\\
+$as_echo "$at_srcdir/ofproto-dpif.at:5025: sort sflow.log | \$EGREP 'IFCOUNTERS|ERROR|PORTNAME|OPENFLOWPORT' | head -18 | sed 's/ /\\
 	/g'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5026"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5025"
 ( $at_check_trace; sort sflow.log | $EGREP 'IFCOUNTERS|ERROR|PORTNAME|OPENFLOWPORT' | head -18 | sed 's/ /\
 	/g'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -137239,7 +137722,7 @@
 	portName=p2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -137250,14 +137733,14 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_864
-#AT_START_865
-at_fn_group_banner 865 'ofproto-dpif.at:5027' \
+#AT_STOP_866
+#AT_START_867
+at_fn_group_banner 867 'ofproto-dpif.at:5026' \
   "ofproto-dpif - sFlow packet sampling - IPv6 collector" "" 52
 at_xfail=no
       test "$IS_WIN32" = "yes" && at_xfail=yes
 (
-  $as_echo "865. $at_setup_line: testing $at_desc ..."
+  $as_echo "867. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -137268,29 +137751,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5027"
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5026"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5027"
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5026"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -137300,49 +137783,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5027"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5026"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5027"
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5026"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5027"
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5026"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -137354,14 +137837,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5027"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5026"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -137369,12 +137852,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -137383,15 +137866,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
-at_fn_check_prepare_trace "ofproto-dpif.at:5027"
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
+at_fn_check_prepare_trace "ofproto-dpif.at:5026"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -137405,15 +137888,15 @@
 mv __cleanup cleanup
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:[::1] > sflow.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:5027"
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:[::1] > sflow.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:5026"
 ( $at_check_trace; ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:[::1] > sflow.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -137446,15 +137929,15 @@
 
       ovs-appctl time/warp 3000 100
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5027"
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5026"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -137462,15 +137945,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5027"
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5026"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -137478,15 +137961,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5027"
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5026"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -137496,12 +137979,12 @@
   ovs-appctl -t test-sflow exit
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: sort sflow.log | \$EGREP 'HEADER|ERROR' | sed 's/ /\\
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: sort sflow.log | \$EGREP 'HEADER|ERROR' | sed 's/ /\\
 	/g'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5027"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5026"
 ( $at_check_trace; sort sflow.log | $EGREP 'HEADER|ERROR' | sed 's/ /\
 	/g'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -137607,7 +138090,7 @@
 	hdr=50-54-00-00-00-05-50-54-00-00-00-07-86-DD-67-00-00-00-00-00-0A-80-FE-80-00-00-00-00-00-00-00-00-00-00-00-00-00-01-FE-80-00-00-00-00-00-00-00-00-00-00-00-00-00-02-00-00-00-00-00-00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -137616,12 +138099,12 @@
 
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5027: sort sflow.log | \$EGREP 'IFCOUNTERS|ERROR|PORTNAME|OPENFLOWPORT' | head -18 | sed 's/ /\\
+$as_echo "$at_srcdir/ofproto-dpif.at:5026: sort sflow.log | \$EGREP 'IFCOUNTERS|ERROR|PORTNAME|OPENFLOWPORT' | head -18 | sed 's/ /\\
 	/g'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5027"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5026"
 ( $at_check_trace; sort sflow.log | $EGREP 'IFCOUNTERS|ERROR|PORTNAME|OPENFLOWPORT' | head -18 | sed 's/ /\
 	/g'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -137795,7 +138278,7 @@
 	portName=p2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5027"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -137806,18 +138289,18 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_865
-#AT_START_866
-at_fn_group_banner 866 'ofproto-dpif.at:5030' \
+#AT_STOP_867
+#AT_START_868
+at_fn_group_banner 868 'ofproto-dpif.at:5029' \
   "ofproto-dpif - sFlow LACP structures" "           " 52
 at_xfail=no
 (
-  $as_echo "866. $at_setup_line: testing $at_desc ..."
+  $as_echo "868. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
-$as_echo "ofproto-dpif.at:5031" >"$at_check_line_file"
+$as_echo "ofproto-dpif.at:5030" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ofproto-dpif.at:5031"
+  && at_fn_check_skip 77 "$at_srcdir/ofproto-dpif.at:5030"
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
    OVS_LOGDIR=`pwd`; export OVS_LOGDIR
    OVS_DBDIR=`pwd`; export OVS_DBDIR
@@ -137825,29 +138308,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5032: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5032"
+$as_echo "$at_srcdir/ofproto-dpif.at:5031: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5031"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5032"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5031"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5032: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5032"
+$as_echo "$at_srcdir/ofproto-dpif.at:5031: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5031"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5032"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5031"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -137857,49 +138340,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5032: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5031: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5032"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5031"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5032"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5031"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5032: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5032"
+$as_echo "$at_srcdir/ofproto-dpif.at:5031: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5031"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5032"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5031"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5032: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5032"
+$as_echo "$at_srcdir/ofproto-dpif.at:5031: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5031"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5032"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5031"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -137911,14 +138394,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5032: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5031: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5032"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5031"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -137926,12 +138409,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5032"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5031"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -137940,7 +138423,7 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5032: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- 		    add-bond br0 bond p1 p2 --				\\
+$as_echo "$at_srcdir/ofproto-dpif.at:5031: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- 		    add-bond br0 bond p1 p2 --				\\
 		    set Port bond lacp=active bond-mode=active-backup	\\
 		    other_config:lacp-time=\"fast\"			\\
 		    other_config:lacp-system-id=11:22:33:44:55:66	\\
@@ -137953,7 +138436,7 @@
 		    other_config:lacp-port-id=22			\\
 		    other_config:lacp-port-priority=222			\\
 		    other_config:lacp-aggregation-key=3333  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5032"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5031"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- 		    add-bond br0 bond p1 p2 --				\
 		    set Port bond lacp=active bond-mode=active-backup	\
 		    other_config:lacp-time="fast"			\
@@ -137967,12 +138450,12 @@
 		    other_config:lacp-port-id=22			\
 		    other_config:lacp-port-priority=222			\
 		    other_config:lacp-aggregation-key=3333
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5032"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5031"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -137986,15 +138469,15 @@
 mv __cleanup cleanup
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5048: ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:5048"
+$as_echo "$at_srcdir/ofproto-dpif.at:5047: ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:5047"
 ( $at_check_trace; ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5048"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5047"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -138012,15 +138495,15 @@
       header=128 sampling=1 polling=1
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5061: ovs-appctl time/warp 2000 100"
-at_fn_check_prepare_trace "ofproto-dpif.at:5061"
+$as_echo "$at_srcdir/ofproto-dpif.at:5060: ovs-appctl time/warp 2000 100"
+at_fn_check_prepare_trace "ofproto-dpif.at:5060"
 ( $at_check_trace; ovs-appctl time/warp 2000 100
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5061"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5060"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138028,15 +138511,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5062: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:5062"
+$as_echo "$at_srcdir/ofproto-dpif.at:5061: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:5061"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5062"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5061"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138044,15 +138527,15 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5063: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5063"
+$as_echo "$at_srcdir/ofproto-dpif.at:5062: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5062"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5063"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5062"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138060,15 +138543,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5063: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5063"
+$as_echo "$at_srcdir/ofproto-dpif.at:5062: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5062"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5063"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5062"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138076,15 +138559,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5063: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5063"
+$as_echo "$at_srcdir/ofproto-dpif.at:5062: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5062"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5063"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5062"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138093,12 +138576,12 @@
 
 ovs-appctl -t test-sflow exit
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5065: sort sflow.log | \$EGREP 'LACPCOUNTERS|ERROR' | head -n 1 | sed 's/ /\\
+$as_echo "$at_srcdir/ofproto-dpif.at:5064: sort sflow.log | \$EGREP 'LACPCOUNTERS|ERROR' | head -n 1 | sed 's/ /\\
 	/g'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5065"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5064"
 ( $at_check_trace; sort sflow.log | $EGREP 'LACPCOUNTERS|ERROR' | head -n 1 | sed 's/ /\
 	/g'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -138120,7 +138603,7 @@
 	markerRespPDUsTx=4294967295
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5065"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5064"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138132,13 +138615,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_866
-#AT_START_867
-at_fn_group_banner 867 'ofproto-dpif.at:5135' \
+#AT_STOP_868
+#AT_START_869
+at_fn_group_banner 869 'ofproto-dpif.at:5134' \
   "ofproto-dpif - NetFlow flow expiration - IPv4 collector" "" 52
 at_xfail=no
 (
-  $as_echo "867. $at_setup_line: testing $at_desc ..."
+  $as_echo "869. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -138148,29 +138631,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5135"
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5134"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5135"
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5134"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -138180,49 +138663,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5135"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5134"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5135"
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5134"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5135"
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5134"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -138234,14 +138717,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5135"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5134"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -138249,12 +138732,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -138263,15 +138746,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
-at_fn_check_prepare_trace "ofproto-dpif.at:5135"
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
+at_fn_check_prepare_trace "ofproto-dpif.at:5134"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -138289,15 +138772,15 @@
 mv __cleanup cleanup
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > netflow.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:5135"
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > netflow.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:5134"
 ( $at_check_trace; ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > netflow.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -138322,15 +138805,15 @@
   ovs-appctl time/warp 6000
   ovs-appctl revalidator/wait
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5135"
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5134"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138338,15 +138821,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5135"
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5134"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138354,15 +138837,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5135"
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5134"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138372,15 +138855,15 @@
   ovs-appctl -t test-netflow exit
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: test \`grep \"192.168.0.1 > 192.168.0.2, if 1 > 65535, 1 pkts, 60 bytes, ICMP 8:0\" netflow.log | wc -l\` -eq 1"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:5135"
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: test \`grep \"192.168.0.1 > 192.168.0.2, if 1 > 65535, 1 pkts, 60 bytes, ICMP 8:0\" netflow.log | wc -l\` -eq 1"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:5134"
 ( $at_check_trace; test `grep "192.168.0.1 > 192.168.0.2, if 1 > 65535, 1 pkts, 60 bytes, ICMP 8:0" netflow.log | wc -l` -eq 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138389,15 +138872,15 @@
 
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: test \`grep \"192.168.0.1 > 192.168.0.2, if 1 > 2, 1 pkts, 60 bytes, ICMP 8:0\" netflow.log | wc -l\` -eq 1"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:5135"
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: test \`grep \"192.168.0.1 > 192.168.0.2, if 1 > 2, 1 pkts, 60 bytes, ICMP 8:0\" netflow.log | wc -l\` -eq 1"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:5134"
 ( $at_check_trace; test `grep "192.168.0.1 > 192.168.0.2, if 1 > 2, 1 pkts, 60 bytes, ICMP 8:0" netflow.log | wc -l` -eq 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138408,15 +138891,15 @@
   combined=`grep "192.168.0.2 > 192.168.0.1, if 2 > 1, 2 pkts, 120 bytes, ICMP 0:0" netflow.log | wc -l`
   separate=`grep "192.168.0.2 > 192.168.0.1, if 2 > 1, 1 pkts, 60 bytes, ICMP 0:0" netflow.log | wc -l`
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5135: test \$separate = 2 || test \$combined = 1"
-at_fn_check_prepare_dynamic "test $separate = 2 || test $combined = 1" "ofproto-dpif.at:5135"
+$as_echo "$at_srcdir/ofproto-dpif.at:5134: test \$separate = 2 || test \$combined = 1"
+at_fn_check_prepare_dynamic "test $separate = 2 || test $combined = 1" "ofproto-dpif.at:5134"
 ( $at_check_trace; test $separate = 2 || test $combined = 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138428,13 +138911,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_867
-#AT_START_868
-at_fn_group_banner 868 'ofproto-dpif.at:5136' \
+#AT_STOP_869
+#AT_START_870
+at_fn_group_banner 870 'ofproto-dpif.at:5135' \
   "ofproto-dpif - NetFlow flow expiration - IPv6 collector" "" 52
 at_xfail=no
 (
-  $as_echo "868. $at_setup_line: testing $at_desc ..."
+  $as_echo "870. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -138444,29 +138927,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5136"
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5135"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5136"
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5135"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -138476,49 +138959,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5136"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5135"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5136"
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5135"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5136"
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5135"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -138530,14 +139013,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5136"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5135"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -138545,12 +139028,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -138559,15 +139042,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
-at_fn_check_prepare_trace "ofproto-dpif.at:5136"
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
+at_fn_check_prepare_trace "ofproto-dpif.at:5135"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -138585,15 +139068,15 @@
 mv __cleanup cleanup
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:[::1] > netflow.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:5136"
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:[::1] > netflow.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:5135"
 ( $at_check_trace; ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:[::1] > netflow.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -138618,15 +139101,15 @@
   ovs-appctl time/warp 6000
   ovs-appctl revalidator/wait
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5136"
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5135"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138634,15 +139117,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5136"
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5135"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138650,15 +139133,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5136"
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5135"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138668,15 +139151,15 @@
   ovs-appctl -t test-netflow exit
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: test \`grep \"192.168.0.1 > 192.168.0.2, if 1 > 65535, 1 pkts, 60 bytes, ICMP 8:0\" netflow.log | wc -l\` -eq 1"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:5136"
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: test \`grep \"192.168.0.1 > 192.168.0.2, if 1 > 65535, 1 pkts, 60 bytes, ICMP 8:0\" netflow.log | wc -l\` -eq 1"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:5135"
 ( $at_check_trace; test `grep "192.168.0.1 > 192.168.0.2, if 1 > 65535, 1 pkts, 60 bytes, ICMP 8:0" netflow.log | wc -l` -eq 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138685,15 +139168,15 @@
 
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: test \`grep \"192.168.0.1 > 192.168.0.2, if 1 > 2, 1 pkts, 60 bytes, ICMP 8:0\" netflow.log | wc -l\` -eq 1"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:5136"
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: test \`grep \"192.168.0.1 > 192.168.0.2, if 1 > 2, 1 pkts, 60 bytes, ICMP 8:0\" netflow.log | wc -l\` -eq 1"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:5135"
 ( $at_check_trace; test `grep "192.168.0.1 > 192.168.0.2, if 1 > 2, 1 pkts, 60 bytes, ICMP 8:0" netflow.log | wc -l` -eq 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138704,15 +139187,15 @@
   combined=`grep "192.168.0.2 > 192.168.0.1, if 2 > 1, 2 pkts, 120 bytes, ICMP 0:0" netflow.log | wc -l`
   separate=`grep "192.168.0.2 > 192.168.0.1, if 2 > 1, 1 pkts, 60 bytes, ICMP 0:0" netflow.log | wc -l`
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5136: test \$separate = 2 || test \$combined = 1"
-at_fn_check_prepare_dynamic "test $separate = 2 || test $combined = 1" "ofproto-dpif.at:5136"
+$as_echo "$at_srcdir/ofproto-dpif.at:5135: test \$separate = 2 || test \$combined = 1"
+at_fn_check_prepare_dynamic "test $separate = 2 || test $combined = 1" "ofproto-dpif.at:5135"
 ( $at_check_trace; test $separate = 2 || test $combined = 1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5136"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5135"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138724,13 +139207,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_868
-#AT_START_869
-at_fn_group_banner 869 'ofproto-dpif.at:5219' \
+#AT_STOP_870
+#AT_START_871
+at_fn_group_banner 871 'ofproto-dpif.at:5218' \
   "ofproto-dpif - NetFlow active expiration - IPv4 collector" "" 52
 at_xfail=no
 (
-  $as_echo "869. $at_setup_line: testing $at_desc ..."
+  $as_echo "871. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -138741,29 +139224,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5219"
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5218"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5219"
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5218"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -138773,49 +139256,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5219"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5218"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5219"
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5218"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5219"
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5218"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -138827,14 +139310,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5219"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5218"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -138842,12 +139325,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -138856,15 +139339,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
-at_fn_check_prepare_trace "ofproto-dpif.at:5219"
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
+at_fn_check_prepare_trace "ofproto-dpif.at:5218"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -138881,15 +139364,15 @@
 mv __cleanup cleanup
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > netflow.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:5219"
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > netflow.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:5218"
 ( $at_check_trace; ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > netflow.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -138904,15 +139387,15 @@
        engine_id=1 engine_type=2 active_timeout=10 add-id-to-interface=false
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovs-appctl time/stop"
-at_fn_check_prepare_trace "ofproto-dpif.at:5219"
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: ovs-appctl time/stop"
+at_fn_check_prepare_trace "ofproto-dpif.at:5218"
 ( $at_check_trace; ovs-appctl time/stop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138933,15 +139416,15 @@
 
   ovs-appctl revalidator/wait
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5219"
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5218"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138949,15 +139432,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5219"
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5218"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -138965,15 +139448,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5219"
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5218"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -139021,17 +139504,17 @@
   # exactly 59 other packets in that direction,
   # and exactly 60 packets in the other direction.
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5219: echo \$n_learn \$n_in \$n_out \$n_other"
-at_fn_check_prepare_dynamic "echo $n_learn $n_in $n_out $n_other" "ofproto-dpif.at:5219"
+$as_echo "$at_srcdir/ofproto-dpif.at:5218: echo \$n_learn \$n_in \$n_out \$n_other"
+at_fn_check_prepare_dynamic "echo $n_learn $n_in $n_out $n_other" "ofproto-dpif.at:5218"
 ( $at_check_trace; echo $n_learn $n_in $n_out $n_other
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "1 59 60 0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5218"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -139043,13 +139526,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_869
-#AT_START_870
-at_fn_group_banner 870 'ofproto-dpif.at:5220' \
+#AT_STOP_871
+#AT_START_872
+at_fn_group_banner 872 'ofproto-dpif.at:5219' \
   "ofproto-dpif - NetFlow active expiration - IPv6 collector" "" 52
 at_xfail=no
 (
-  $as_echo "870. $at_setup_line: testing $at_desc ..."
+  $as_echo "872. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -139060,29 +139543,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5220"
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5219"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5220"
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5219"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -139092,49 +139575,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5220"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5219"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5220"
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5219"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5220"
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5219"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -139146,14 +139629,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5220"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5219"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -139161,12 +139644,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -139175,15 +139658,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
-at_fn_check_prepare_trace "ofproto-dpif.at:5220"
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
+at_fn_check_prepare_trace "ofproto-dpif.at:5219"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -139200,15 +139683,15 @@
 mv __cleanup cleanup
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:[::1] > netflow.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:5220"
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:[::1] > netflow.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:5219"
 ( $at_check_trace; ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:[::1] > netflow.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -139223,15 +139706,15 @@
        engine_id=1 engine_type=2 active_timeout=10 add-id-to-interface=false
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: ovs-appctl time/stop"
-at_fn_check_prepare_trace "ofproto-dpif.at:5220"
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovs-appctl time/stop"
+at_fn_check_prepare_trace "ofproto-dpif.at:5219"
 ( $at_check_trace; ovs-appctl time/stop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -139252,15 +139735,15 @@
 
   ovs-appctl revalidator/wait
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5220"
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5219"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -139268,15 +139751,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5220"
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5219"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -139284,15 +139767,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5220"
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5219"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -139340,17 +139823,17 @@
   # exactly 59 other packets in that direction,
   # and exactly 60 packets in the other direction.
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5220: echo \$n_learn \$n_in \$n_out \$n_other"
-at_fn_check_prepare_dynamic "echo $n_learn $n_in $n_out $n_other" "ofproto-dpif.at:5220"
+$as_echo "$at_srcdir/ofproto-dpif.at:5219: echo \$n_learn \$n_in \$n_out \$n_other"
+at_fn_check_prepare_dynamic "echo $n_learn $n_in $n_out $n_other" "ofproto-dpif.at:5219"
 ( $at_check_trace; echo $n_learn $n_in $n_out $n_other
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "1 59 60 0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -139362,13 +139845,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_870
-#AT_START_871
-at_fn_group_banner 871 'ofproto-dpif.at:5222' \
+#AT_STOP_872
+#AT_START_873
+at_fn_group_banner 873 'ofproto-dpif.at:5221' \
   "ofproto-dpif - flow stats" "                      " 52
 at_xfail=no
 (
-  $as_echo "871. $at_setup_line: testing $at_desc ..."
+  $as_echo "873. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -139378,29 +139861,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5223: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5223"
+$as_echo "$at_srcdir/ofproto-dpif.at:5222: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5222"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5223"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5222"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5223: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5223"
+$as_echo "$at_srcdir/ofproto-dpif.at:5222: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5222"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5223"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5222"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -139410,49 +139893,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5223: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5222: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5223"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5222"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5223"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5222"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5223: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5223"
+$as_echo "$at_srcdir/ofproto-dpif.at:5222: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5222"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5223"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5222"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5223: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5223"
+$as_echo "$at_srcdir/ofproto-dpif.at:5222: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5222"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5223"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5222"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -139464,14 +139947,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5223: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5222: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5223"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5222"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -139479,12 +139962,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5223"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5222"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -139493,15 +139976,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5223: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5223"
+$as_echo "$at_srcdir/ofproto-dpif.at:5222: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5222"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5223"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5222"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -139509,30 +139992,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5224: ovs-ofctl add-flow br0 \"ip,actions=NORMAL\""
-at_fn_check_prepare_trace "ofproto-dpif.at:5224"
+$as_echo "$at_srcdir/ofproto-dpif.at:5223: ovs-ofctl add-flow br0 \"ip,actions=NORMAL\""
+at_fn_check_prepare_trace "ofproto-dpif.at:5223"
 ( $at_check_trace; ovs-ofctl add-flow br0 "ip,actions=NORMAL"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5224"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5223"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5225: ovs-ofctl add-flow br0 \"icmp,actions=NORMAL\""
-at_fn_check_prepare_trace "ofproto-dpif.at:5225"
+$as_echo "$at_srcdir/ofproto-dpif.at:5224: ovs-ofctl add-flow br0 \"icmp,actions=NORMAL\""
+at_fn_check_prepare_trace "ofproto-dpif.at:5224"
 ( $at_check_trace; ovs-ofctl add-flow br0 "icmp,actions=NORMAL"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5225"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5224"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -139546,55 +140029,55 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5233: ovs-appctl time/warp 1000"
-at_fn_check_prepare_trace "ofproto-dpif.at:5233"
+$as_echo "$at_srcdir/ofproto-dpif.at:5232: ovs-appctl time/warp 1000"
+at_fn_check_prepare_trace "ofproto-dpif.at:5232"
 ( $at_check_trace; ovs-appctl time/warp 1000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5233"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5232"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5234: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:5234"
+$as_echo "$at_srcdir/ofproto-dpif.at:5233: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:5233"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5234"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5235: ovs-ofctl dump-flows br0"
-at_fn_check_prepare_trace "ofproto-dpif.at:5235"
+$as_echo "$at_srcdir/ofproto-dpif.at:5234: ovs-ofctl dump-flows br0"
+at_fn_check_prepare_trace "ofproto-dpif.at:5234"
 ( $at_check_trace; ovs-ofctl dump-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5235"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5236: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed -n 's/duration=[0-9]*\\.[0-9]*s/duration=0.0s/p' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5236"
+$as_echo "$at_srcdir/ofproto-dpif.at:5235: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed -n 's/duration=[0-9]*\\.[0-9]*s/duration=0.0s/p' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5235"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed -n 's/duration=[0-9]*\.[0-9]*s/duration=0.0s/p' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -139602,52 +140085,52 @@
  cookie=0x0, duration=0.0s, table=0, n_packets=10, n_bytes=600, idle_age=1, ip actions=NORMAL
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5236"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5235"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5240: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5240"
+$as_echo "$at_srcdir/ofproto-dpif.at:5239: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5239"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5240"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5239"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5240: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5240"
+$as_echo "$at_srcdir/ofproto-dpif.at:5239: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5239"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5240"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5239"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5240: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5240"
+$as_echo "$at_srcdir/ofproto-dpif.at:5239: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5239"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5240"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5239"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -139657,13 +140140,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_871
-#AT_START_872
-at_fn_group_banner 872 'ofproto-dpif.at:5243' \
+#AT_STOP_873
+#AT_START_874
+at_fn_group_banner 874 'ofproto-dpif.at:5242' \
   "ofproto-dpif - flow stats, set-n-threads" "       " 52
 at_xfail=no
 (
-  $as_echo "872. $at_setup_line: testing $at_desc ..."
+  $as_echo "874. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -139673,29 +140156,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5244: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5244"
+$as_echo "$at_srcdir/ofproto-dpif.at:5243: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5243"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5244"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5243"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5244: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5244"
+$as_echo "$at_srcdir/ofproto-dpif.at:5243: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5243"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5244"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5243"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -139705,49 +140188,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5244: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5243: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5244"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5243"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5244"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5243"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5244: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5244"
+$as_echo "$at_srcdir/ofproto-dpif.at:5243: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5243"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5244"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5243"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5244: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5244"
+$as_echo "$at_srcdir/ofproto-dpif.at:5243: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5243"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5244"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5243"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -139759,14 +140242,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5244: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5243: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5244"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5243"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -139774,12 +140257,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5244"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5243"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -139788,15 +140271,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5244: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5244"
+$as_echo "$at_srcdir/ofproto-dpif.at:5243: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5243"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5244"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5243"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -139804,30 +140287,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5245: ovs-ofctl add-flow br0 \"ip,actions=NORMAL\""
-at_fn_check_prepare_trace "ofproto-dpif.at:5245"
+$as_echo "$at_srcdir/ofproto-dpif.at:5244: ovs-ofctl add-flow br0 \"ip,actions=NORMAL\""
+at_fn_check_prepare_trace "ofproto-dpif.at:5244"
 ( $at_check_trace; ovs-ofctl add-flow br0 "ip,actions=NORMAL"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5245"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5244"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5246: ovs-ofctl add-flow br0 \"icmp,actions=NORMAL\""
-at_fn_check_prepare_trace "ofproto-dpif.at:5246"
+$as_echo "$at_srcdir/ofproto-dpif.at:5245: ovs-ofctl add-flow br0 \"icmp,actions=NORMAL\""
+at_fn_check_prepare_trace "ofproto-dpif.at:5245"
 ( $at_check_trace; ovs-ofctl add-flow br0 "icmp,actions=NORMAL"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5246"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5245"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -139842,15 +140325,15 @@
 
 ovs-appctl time/warp 100
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5255: ovs-vsctl set Open_vSwitch . other-config:n-revalidator-threads=2"
-at_fn_check_prepare_trace "ofproto-dpif.at:5255"
+$as_echo "$at_srcdir/ofproto-dpif.at:5254: ovs-vsctl set Open_vSwitch . other-config:n-revalidator-threads=2"
+at_fn_check_prepare_trace "ofproto-dpif.at:5254"
 ( $at_check_trace; ovs-vsctl set Open_vSwitch . other-config:n-revalidator-threads=2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5255"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5254"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -139859,25 +140342,25 @@
 ovs-appctl time/warp 1000
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5258: ovs-ofctl dump-flows br0"
-at_fn_check_prepare_trace "ofproto-dpif.at:5258"
+$as_echo "$at_srcdir/ofproto-dpif.at:5257: ovs-ofctl dump-flows br0"
+at_fn_check_prepare_trace "ofproto-dpif.at:5257"
 ( $at_check_trace; ovs-ofctl dump-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5258"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5257"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5259: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed -n 's/duration=[0-9]*\\.[0-9]*s/duration=0.0s/p' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5259"
+$as_echo "$at_srcdir/ofproto-dpif.at:5258: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed -n 's/duration=[0-9]*\\.[0-9]*s/duration=0.0s/p' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5258"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout | sed -n 's/duration=[0-9]*\.[0-9]*s/duration=0.0s/p' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -139885,52 +140368,52 @@
  cookie=0x0, duration=0.0s, table=0, n_packets=10, n_bytes=600, idle_age=1, ip actions=NORMAL
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5259"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5258"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5263: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5263"
+$as_echo "$at_srcdir/ofproto-dpif.at:5262: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5262"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5262"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5263: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5263"
+$as_echo "$at_srcdir/ofproto-dpif.at:5262: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5262"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5262"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5263: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5263"
+$as_echo "$at_srcdir/ofproto-dpif.at:5262: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5262"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5263"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5262"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -139940,13 +140423,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_872
-#AT_START_873
-at_fn_group_banner 873 'ofproto-dpif.at:5266' \
+#AT_STOP_874
+#AT_START_875
+at_fn_group_banner 875 'ofproto-dpif.at:5265' \
   "ofproto-dpif - idle_age and hard_age increase over time" "" 52
 at_xfail=no
 (
-  $as_echo "873. $at_setup_line: testing $at_desc ..."
+  $as_echo "875. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -139956,29 +140439,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5267: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5267"
+$as_echo "$at_srcdir/ofproto-dpif.at:5266: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5266"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5267"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5266"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5267: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5267"
+$as_echo "$at_srcdir/ofproto-dpif.at:5266: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5266"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5267"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5266"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -139988,49 +140471,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5267: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5266: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5267"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5266"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5267"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5266"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5267: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5267"
+$as_echo "$at_srcdir/ofproto-dpif.at:5266: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5266"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5267"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5267: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5267"
+$as_echo "$at_srcdir/ofproto-dpif.at:5266: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5266"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5267"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -140042,14 +140525,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5267: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5266: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5267"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5266"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -140057,12 +140540,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5267"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140071,15 +140554,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5267: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5267"
+$as_echo "$at_srcdir/ofproto-dpif.at:5266: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5266"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5267"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140096,15 +140579,15 @@
 # to 0.
 get_ages () {
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5277: ovs-ofctl dump-flows br0"
-at_fn_check_prepare_trace "ofproto-dpif.at:5277"
+$as_echo "$at_srcdir/ofproto-dpif.at:5276: ovs-ofctl dump-flows br0"
+at_fn_check_prepare_trace "ofproto-dpif.at:5276"
 ( $at_check_trace; ovs-ofctl dump-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5277"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140113,15 +140596,15 @@
 
     duration=`sed -n 's/.*duration=\([0-9]*\)\(\.[0-9]*\)\{0,1\}s.*/\1/p' stdout`
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5280: expr X\"\$duration\" : 'X[0-9][0-9]*\$'"
-at_fn_check_prepare_dynamic "expr X\"$duration\" : 'X[0-9][0-9]*$'" "ofproto-dpif.at:5280"
+$as_echo "$at_srcdir/ofproto-dpif.at:5279: expr X\"\$duration\" : 'X[0-9][0-9]*\$'"
+at_fn_check_prepare_dynamic "expr X\"$duration\" : 'X[0-9][0-9]*$'" "ofproto-dpif.at:5279"
 ( $at_check_trace; expr X"$duration" : 'X[0-9][0-9]*$'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5280"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5279"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140134,15 +140617,15 @@
         hard=none
     else
         { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5287: expr X\"\$hard\" : 'X[0-9][0-9]*\$'"
-at_fn_check_prepare_dynamic "expr X\"$hard\" : 'X[0-9][0-9]*$'" "ofproto-dpif.at:5287"
+$as_echo "$at_srcdir/ofproto-dpif.at:5286: expr X\"\$hard\" : 'X[0-9][0-9]*\$'"
+at_fn_check_prepare_dynamic "expr X\"$hard\" : 'X[0-9][0-9]*$'" "ofproto-dpif.at:5286"
 ( $at_check_trace; expr X"$hard" : 'X[0-9][0-9]*$'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5287"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5286"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140156,15 +140639,15 @@
         idle=0
     else
         { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5295: expr X\"\$idle\" : 'X[0-9][0-9]*\$'"
-at_fn_check_prepare_dynamic "expr X\"$idle\" : 'X[0-9][0-9]*$'" "ofproto-dpif.at:5295"
+$as_echo "$at_srcdir/ofproto-dpif.at:5294: expr X\"\$idle\" : 'X[0-9][0-9]*\$'"
+at_fn_check_prepare_dynamic "expr X\"$idle\" : 'X[0-9][0-9]*$'" "ofproto-dpif.at:5294"
 ( $at_check_trace; expr X"$idle" : 'X[0-9][0-9]*$'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5295"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5294"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140176,15 +140659,15 @@
 
 # Add a flow and get its initial hard and idle age.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5301: ovs-ofctl add-flow br0 hard_timeout=199,idle_timeout=188,actions=drop"
-at_fn_check_prepare_trace "ofproto-dpif.at:5301"
+$as_echo "$at_srcdir/ofproto-dpif.at:5300: ovs-ofctl add-flow br0 hard_timeout=199,idle_timeout=188,actions=drop"
+at_fn_check_prepare_trace "ofproto-dpif.at:5300"
 ( $at_check_trace; ovs-ofctl add-flow br0 hard_timeout=199,idle_timeout=188,actions=drop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5301"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5300"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140197,15 +140680,15 @@
 ovs-appctl time/warp 10000
 get_ages duration2 hard2 idle2
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5308: ovs-ofctl mod-flows br0 actions=flood"
-at_fn_check_prepare_trace "ofproto-dpif.at:5308"
+$as_echo "$at_srcdir/ofproto-dpif.at:5307: ovs-ofctl mod-flows br0 actions=flood"
+at_fn_check_prepare_trace "ofproto-dpif.at:5307"
 ( $at_check_trace; ovs-ofctl mod-flows br0 actions=flood
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5308"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5307"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140231,45 +140714,45 @@
 
 # Duration should increase steadily over time.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5328: test \$duration1 -lt \$duration2"
-at_fn_check_prepare_dynamic "test $duration1 -lt $duration2" "ofproto-dpif.at:5328"
+$as_echo "$at_srcdir/ofproto-dpif.at:5327: test \$duration1 -lt \$duration2"
+at_fn_check_prepare_dynamic "test $duration1 -lt $duration2" "ofproto-dpif.at:5327"
 ( $at_check_trace; test $duration1 -lt $duration2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5328"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5327"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5329: test \$duration2 -lt \$duration3"
-at_fn_check_prepare_dynamic "test $duration2 -lt $duration3" "ofproto-dpif.at:5329"
+$as_echo "$at_srcdir/ofproto-dpif.at:5328: test \$duration2 -lt \$duration3"
+at_fn_check_prepare_dynamic "test $duration2 -lt $duration3" "ofproto-dpif.at:5328"
 ( $at_check_trace; test $duration2 -lt $duration3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5329"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5328"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5330: test \$duration3 -lt \$duration4"
-at_fn_check_prepare_dynamic "test $duration3 -lt $duration4" "ofproto-dpif.at:5330"
+$as_echo "$at_srcdir/ofproto-dpif.at:5329: test \$duration3 -lt \$duration4"
+at_fn_check_prepare_dynamic "test $duration3 -lt $duration4" "ofproto-dpif.at:5329"
 ( $at_check_trace; test $duration3 -lt $duration4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5330"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5329"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140279,75 +140762,75 @@
 # Hard age should be "none" initially because it's the same as flow_duration,
 # then it should increase.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5334: test \$hard1 = none"
-at_fn_check_prepare_dynamic "test $hard1 = none" "ofproto-dpif.at:5334"
+$as_echo "$at_srcdir/ofproto-dpif.at:5333: test \$hard1 = none"
+at_fn_check_prepare_dynamic "test $hard1 = none" "ofproto-dpif.at:5333"
 ( $at_check_trace; test $hard1 = none
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5334"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5333"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5335: test \$hard2 = none"
-at_fn_check_prepare_dynamic "test $hard2 = none" "ofproto-dpif.at:5335"
+$as_echo "$at_srcdir/ofproto-dpif.at:5334: test \$hard2 = none"
+at_fn_check_prepare_dynamic "test $hard2 = none" "ofproto-dpif.at:5334"
 ( $at_check_trace; test $hard2 = none
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5335"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5334"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5336: test \$hard3 != none"
-at_fn_check_prepare_dynamic "test $hard3 != none" "ofproto-dpif.at:5336"
+$as_echo "$at_srcdir/ofproto-dpif.at:5335: test \$hard3 != none"
+at_fn_check_prepare_dynamic "test $hard3 != none" "ofproto-dpif.at:5335"
 ( $at_check_trace; test $hard3 != none
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5336"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5335"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5337: test \$hard4 != none"
-at_fn_check_prepare_dynamic "test $hard4 != none" "ofproto-dpif.at:5337"
+$as_echo "$at_srcdir/ofproto-dpif.at:5336: test \$hard4 != none"
+at_fn_check_prepare_dynamic "test $hard4 != none" "ofproto-dpif.at:5336"
 ( $at_check_trace; test $hard4 != none
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5337"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5336"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5338: test \$hard3 -lt \$hard4"
-at_fn_check_prepare_dynamic "test $hard3 -lt $hard4" "ofproto-dpif.at:5338"
+$as_echo "$at_srcdir/ofproto-dpif.at:5337: test \$hard3 -lt \$hard4"
+at_fn_check_prepare_dynamic "test $hard3 -lt $hard4" "ofproto-dpif.at:5337"
 ( $at_check_trace; test $hard3 -lt $hard4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5338"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5337"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140356,45 +140839,45 @@
 
 # Idle age should increase from 1 to 2 to 3, then decrease.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5341: test \$idle1 -lt \$idle2"
-at_fn_check_prepare_dynamic "test $idle1 -lt $idle2" "ofproto-dpif.at:5341"
+$as_echo "$at_srcdir/ofproto-dpif.at:5340: test \$idle1 -lt \$idle2"
+at_fn_check_prepare_dynamic "test $idle1 -lt $idle2" "ofproto-dpif.at:5340"
 ( $at_check_trace; test $idle1 -lt $idle2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5341"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5340"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5342: test \$idle2 -lt \$idle3"
-at_fn_check_prepare_dynamic "test $idle2 -lt $idle3" "ofproto-dpif.at:5342"
+$as_echo "$at_srcdir/ofproto-dpif.at:5341: test \$idle2 -lt \$idle3"
+at_fn_check_prepare_dynamic "test $idle2 -lt $idle3" "ofproto-dpif.at:5341"
 ( $at_check_trace; test $idle2 -lt $idle3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5342"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5341"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5343: test \$idle3 -gt \$idle4"
-at_fn_check_prepare_dynamic "test $idle3 -gt $idle4" "ofproto-dpif.at:5343"
+$as_echo "$at_srcdir/ofproto-dpif.at:5342: test \$idle3 -gt \$idle4"
+at_fn_check_prepare_dynamic "test $idle3 -gt $idle4" "ofproto-dpif.at:5342"
 ( $at_check_trace; test $idle3 -gt $idle4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5343"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5342"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140403,90 +140886,90 @@
 
 # Check some invariant relationships.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5346: test \$duration1 = \$idle1"
-at_fn_check_prepare_dynamic "test $duration1 = $idle1" "ofproto-dpif.at:5346"
+$as_echo "$at_srcdir/ofproto-dpif.at:5345: test \$duration1 = \$idle1"
+at_fn_check_prepare_dynamic "test $duration1 = $idle1" "ofproto-dpif.at:5345"
 ( $at_check_trace; test $duration1 = $idle1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5346"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5345"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5347: test \$duration2 = \$idle2"
-at_fn_check_prepare_dynamic "test $duration2 = $idle2" "ofproto-dpif.at:5347"
+$as_echo "$at_srcdir/ofproto-dpif.at:5346: test \$duration2 = \$idle2"
+at_fn_check_prepare_dynamic "test $duration2 = $idle2" "ofproto-dpif.at:5346"
 ( $at_check_trace; test $duration2 = $idle2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5347"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5346"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5348: test \$duration3 = \$idle3"
-at_fn_check_prepare_dynamic "test $duration3 = $idle3" "ofproto-dpif.at:5348"
+$as_echo "$at_srcdir/ofproto-dpif.at:5347: test \$duration3 = \$idle3"
+at_fn_check_prepare_dynamic "test $duration3 = $idle3" "ofproto-dpif.at:5347"
 ( $at_check_trace; test $duration3 = $idle3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5348"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5347"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5349: test \$idle3 -gt \$hard3"
-at_fn_check_prepare_dynamic "test $idle3 -gt $hard3" "ofproto-dpif.at:5349"
+$as_echo "$at_srcdir/ofproto-dpif.at:5348: test \$idle3 -gt \$hard3"
+at_fn_check_prepare_dynamic "test $idle3 -gt $hard3" "ofproto-dpif.at:5348"
 ( $at_check_trace; test $idle3 -gt $hard3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5349"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5348"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5350: test \$idle4 -lt \$hard4"
-at_fn_check_prepare_dynamic "test $idle4 -lt $hard4" "ofproto-dpif.at:5350"
+$as_echo "$at_srcdir/ofproto-dpif.at:5349: test \$idle4 -lt \$hard4"
+at_fn_check_prepare_dynamic "test $idle4 -lt $hard4" "ofproto-dpif.at:5349"
 ( $at_check_trace; test $idle4 -lt $hard4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5350"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5349"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5351: test \$hard4 -lt \$duration4"
-at_fn_check_prepare_dynamic "test $hard4 -lt $duration4" "ofproto-dpif.at:5351"
+$as_echo "$at_srcdir/ofproto-dpif.at:5350: test \$hard4 -lt \$duration4"
+at_fn_check_prepare_dynamic "test $hard4 -lt $duration4" "ofproto-dpif.at:5350"
 ( $at_check_trace; test $hard4 -lt $duration4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5351"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5350"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140494,45 +140977,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5353: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5353"
+$as_echo "$at_srcdir/ofproto-dpif.at:5352: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5352"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5353"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5352"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5353: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5353"
+$as_echo "$at_srcdir/ofproto-dpif.at:5352: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5352"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5353"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5352"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5353: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5353"
+$as_echo "$at_srcdir/ofproto-dpif.at:5352: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5352"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5353"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5352"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140542,13 +141025,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_873
-#AT_START_874
-at_fn_group_banner 874 'ofproto-dpif.at:5356' \
+#AT_STOP_875
+#AT_START_876
+at_fn_group_banner 876 'ofproto-dpif.at:5355' \
   "ofproto-dpif - fin_timeout" "                     " 52
 at_xfail=no
 (
-  $as_echo "874. $at_setup_line: testing $at_desc ..."
+  $as_echo "876. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -140558,29 +141041,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5357: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5357"
+$as_echo "$at_srcdir/ofproto-dpif.at:5356: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5356"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5357"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5356"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5357: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5357"
+$as_echo "$at_srcdir/ofproto-dpif.at:5356: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5356"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5357"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5356"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -140590,49 +141073,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5357: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5356: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5357"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5356"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5357"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5356"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5357: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5357"
+$as_echo "$at_srcdir/ofproto-dpif.at:5356: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5356"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5357"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5356"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5357: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5357"
+$as_echo "$at_srcdir/ofproto-dpif.at:5356: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5356"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5357"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5356"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -140644,14 +141127,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5357: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5356: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5357"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5356"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -140659,12 +141142,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5357"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5356"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140673,15 +141156,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5357: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5357"
+$as_echo "$at_srcdir/ofproto-dpif.at:5356: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5356"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5357"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5356"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140690,25 +141173,25 @@
 
 ovs-appctl time/stop
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5359: ovs-ofctl add-flow br0 'idle_timeout=60,actions=fin_timeout(idle_timeout=5)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5359"
+$as_echo "$at_srcdir/ofproto-dpif.at:5358: ovs-ofctl add-flow br0 'idle_timeout=60,actions=fin_timeout(idle_timeout=5)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5358"
 ( $at_check_trace; ovs-ofctl add-flow br0 'idle_timeout=60,actions=fin_timeout(idle_timeout=5)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5359"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5358"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5360: ovs-ofctl dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5360"
+$as_echo "$at_srcdir/ofproto-dpif.at:5359: ovs-ofctl dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5359"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -140716,7 +141199,7 @@
  idle_timeout=60, actions=fin_timeout(idle_timeout=5)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5360"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5359"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140728,25 +141211,25 @@
 # feature, we warp forward a couple of times to ensure that flow stats
 # run before re-checking the flow table.)
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5369: ovs-appctl netdev-dummy/receive br0 0021853763af0026b98cb0f908004500003c2e2440004006465dac11370dac11370b828b0016751e267b00000000a00216d017360000020405b40402080a2d25085f0000000001030307"
-at_fn_check_prepare_trace "ofproto-dpif.at:5369"
+$as_echo "$at_srcdir/ofproto-dpif.at:5368: ovs-appctl netdev-dummy/receive br0 0021853763af0026b98cb0f908004500003c2e2440004006465dac11370dac11370b828b0016751e267b00000000a00216d017360000020405b40402080a2d25085f0000000001030307"
+at_fn_check_prepare_trace "ofproto-dpif.at:5368"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive br0 0021853763af0026b98cb0f908004500003c2e2440004006465dac11370dac11370b828b0016751e267b00000000a00216d017360000020405b40402080a2d25085f0000000001030307
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5369"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5368"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5370: ovs-appctl time/warp 1000 && ovs-appctl time/warp 1000"
-at_fn_check_prepare_trace "ofproto-dpif.at:5370"
+$as_echo "$at_srcdir/ofproto-dpif.at:5369: ovs-appctl time/warp 1000 && ovs-appctl time/warp 1000"
+at_fn_check_prepare_trace "ofproto-dpif.at:5369"
 ( $at_check_trace; ovs-appctl time/warp 1000 && ovs-appctl time/warp 1000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -140754,32 +141237,32 @@
 warped
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5370"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5369"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5373: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:5373"
+$as_echo "$at_srcdir/ofproto-dpif.at:5372: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:5372"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5373"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5372"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5374: ovs-ofctl dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5374"
+$as_echo "$at_srcdir/ofproto-dpif.at:5373: ovs-ofctl dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5373"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -140787,7 +141270,7 @@
  n_packets=1, n_bytes=74, idle_timeout=60, actions=fin_timeout(idle_timeout=5)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5374"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5373"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140795,25 +141278,25 @@
 
 # Check that a TCP FIN packet does change the timeout.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5379: ovs-appctl netdev-dummy/receive br0 0021853763af0026b98cb0f90800451000342e3e40004006463bac11370dac11370b828b0016751e319dfc96399b801100717ae800000101080a2d250a9408579588"
-at_fn_check_prepare_trace "ofproto-dpif.at:5379"
+$as_echo "$at_srcdir/ofproto-dpif.at:5378: ovs-appctl netdev-dummy/receive br0 0021853763af0026b98cb0f90800451000342e3e40004006463bac11370dac11370b828b0016751e319dfc96399b801100717ae800000101080a2d250a9408579588"
+at_fn_check_prepare_trace "ofproto-dpif.at:5378"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive br0 0021853763af0026b98cb0f90800451000342e3e40004006463bac11370dac11370b828b0016751e319dfc96399b801100717ae800000101080a2d250a9408579588
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5379"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5378"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5380: ovs-appctl time/warp 1000 && ovs-appctl time/warp 1000"
-at_fn_check_prepare_trace "ofproto-dpif.at:5380"
+$as_echo "$at_srcdir/ofproto-dpif.at:5379: ovs-appctl time/warp 1000 && ovs-appctl time/warp 1000"
+at_fn_check_prepare_trace "ofproto-dpif.at:5379"
 ( $at_check_trace; ovs-appctl time/warp 1000 && ovs-appctl time/warp 1000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -140821,17 +141304,17 @@
 warped
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5380"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5379"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5383: ovs-ofctl dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5383"
+$as_echo "$at_srcdir/ofproto-dpif.at:5382: ovs-ofctl dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5382"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -140839,52 +141322,52 @@
  n_packets=2, n_bytes=140, idle_timeout=5, actions=fin_timeout(idle_timeout=5)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5383"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5382"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5387: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5387"
+$as_echo "$at_srcdir/ofproto-dpif.at:5386: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5386"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5386"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5387: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5387"
+$as_echo "$at_srcdir/ofproto-dpif.at:5386: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5386"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5386"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5387: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5387"
+$as_echo "$at_srcdir/ofproto-dpif.at:5386: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5386"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5386"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -140894,13 +141377,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_874
-#AT_START_875
-at_fn_group_banner 875 'ofproto-dpif.at:5390' \
+#AT_STOP_876
+#AT_START_877
+at_fn_group_banner 877 'ofproto-dpif.at:5389' \
   "ofproto-dpif - ovs-appctl dpif/dump-dps" "        " 52
 at_xfail=no
 (
-  $as_echo "875. $at_setup_line: testing $at_desc ..."
+  $as_echo "877. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -140910,29 +141393,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5391: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5391"
+$as_echo "$at_srcdir/ofproto-dpif.at:5390: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5390"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5391"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5390"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5391: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5391"
+$as_echo "$at_srcdir/ofproto-dpif.at:5390: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5390"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5391"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5390"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -140942,49 +141425,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5391: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5390: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5391"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5390"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5391"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5390"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5391: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5391"
+$as_echo "$at_srcdir/ofproto-dpif.at:5390: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5390"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5391"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5390"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5391: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5391"
+$as_echo "$at_srcdir/ofproto-dpif.at:5390: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5390"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5391"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5390"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -140996,14 +141479,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5391: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5390: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5391"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5390"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -141011,12 +141494,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5391"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5390"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141025,15 +141508,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5391: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- set bridge br1 datapath-type=dummy "
-at_fn_check_prepare_trace "ofproto-dpif.at:5391"
+$as_echo "$at_srcdir/ofproto-dpif.at:5390: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- set bridge br1 datapath-type=dummy "
+at_fn_check_prepare_trace "ofproto-dpif.at:5390"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- set bridge br1 datapath-type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5391"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5390"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141047,10 +141530,10 @@
     -- add-port br1 p3 -- set Interface p3 type=dummy ofport_request=3
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5395: ovs-appctl dpif/dump-dps"
-at_fn_check_prepare_trace "ofproto-dpif.at:5395"
+$as_echo "$at_srcdir/ofproto-dpif.at:5394: ovs-appctl dpif/dump-dps"
+at_fn_check_prepare_trace "ofproto-dpif.at:5394"
 ( $at_check_trace; ovs-appctl dpif/dump-dps
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -141058,52 +141541,52 @@
 dummy@br1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5395"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5394"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5399: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5399"
+$as_echo "$at_srcdir/ofproto-dpif.at:5398: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5398"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5399"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5398"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5399: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5399"
+$as_echo "$at_srcdir/ofproto-dpif.at:5398: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5398"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5399"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5398"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5399: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5399"
+$as_echo "$at_srcdir/ofproto-dpif.at:5398: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5398"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5399"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5398"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141113,13 +141596,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_875
-#AT_START_876
-at_fn_group_banner 876 'ofproto-dpif.at:5402' \
+#AT_STOP_877
+#AT_START_878
+at_fn_group_banner 878 'ofproto-dpif.at:5401' \
   "ofproto-dpif - ovs-appctl dpif/show" "            " 52
 at_xfail=no
 (
-  $as_echo "876. $at_setup_line: testing $at_desc ..."
+  $as_echo "878. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -141129,29 +141612,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5403: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5403"
+$as_echo "$at_srcdir/ofproto-dpif.at:5402: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5402"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5402"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5403: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5403"
+$as_echo "$at_srcdir/ofproto-dpif.at:5402: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5402"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5402"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -141161,49 +141644,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5403: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5402: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5403"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5402"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5402"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5403: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5403"
+$as_echo "$at_srcdir/ofproto-dpif.at:5402: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5402"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5402"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5403: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5403"
+$as_echo "$at_srcdir/ofproto-dpif.at:5402: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5402"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5402"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -141215,14 +141698,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5403: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5402: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5403"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5402"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -141230,12 +141713,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5402"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141244,15 +141727,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5403: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- set bridge br1 datapath-type=dummy "
-at_fn_check_prepare_trace "ofproto-dpif.at:5403"
+$as_echo "$at_srcdir/ofproto-dpif.at:5402: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- set bridge br1 datapath-type=dummy "
+at_fn_check_prepare_trace "ofproto-dpif.at:5402"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- set bridge br1 datapath-type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5403"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5402"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141266,10 +141749,10 @@
     -- add-port br1 p3 -- set Interface p3 type=dummy ofport_request=3
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5407: ovs-appctl dpif/show"
-at_fn_check_prepare_trace "ofproto-dpif.at:5407"
+$as_echo "$at_srcdir/ofproto-dpif.at:5406: ovs-appctl dpif/show"
+at_fn_check_prepare_trace "ofproto-dpif.at:5406"
 ( $at_check_trace; ovs-appctl dpif/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -141283,52 +141766,52 @@
 		p3 3/3: (dummy)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5406"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5417: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5417"
+$as_echo "$at_srcdir/ofproto-dpif.at:5416: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5416"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5417"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5416"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5417: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5417"
+$as_echo "$at_srcdir/ofproto-dpif.at:5416: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5416"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5417"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5416"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5417: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5417"
+$as_echo "$at_srcdir/ofproto-dpif.at:5416: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5416"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5417"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5416"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141338,13 +141821,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_876
-#AT_START_877
-at_fn_group_banner 877 'ofproto-dpif.at:5420' \
+#AT_STOP_878
+#AT_START_879
+at_fn_group_banner 879 'ofproto-dpif.at:5419' \
   "ofproto-dpif - ovs-appctl dpif/dump-flows" "      " 52
 at_xfail=no
 (
-  $as_echo "877. $at_setup_line: testing $at_desc ..."
+  $as_echo "879. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # bump max-idle to avoid the flows being reclaimed behind us
@@ -141355,29 +141838,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5422: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5422"
+$as_echo "$at_srcdir/ofproto-dpif.at:5421: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5421"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5422"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5421"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5422: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5422"
+$as_echo "$at_srcdir/ofproto-dpif.at:5421: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5421"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5422"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5421"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -141387,49 +141870,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5422: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5421: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5422"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5421"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5422"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5421"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5422: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5422"
+$as_echo "$at_srcdir/ofproto-dpif.at:5421: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5421"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5422"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5421"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5422: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5422"
+$as_echo "$at_srcdir/ofproto-dpif.at:5421: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5421"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5422"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5421"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -141441,14 +141924,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5422: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5421: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5422"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5421"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -141456,12 +141939,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5422"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5421"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141470,19 +141953,19 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5422: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- \\
+$as_echo "$at_srcdir/ofproto-dpif.at:5421: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- \\
                     set bridge br1 datapath-type=dummy fail-mode=secure -- \\
                     set Open_vSwitch . other_config:max-idle=10000 "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5422"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5421"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- \
                     set bridge br1 datapath-type=dummy fail-mode=secure -- \
                     set Open_vSwitch . other_config:max-idle=10000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5422"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5421"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141496,45 +141979,45 @@
     -- add-port br1 p3 -- set Interface p3 type=dummy ofport_request=3
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5428: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5428"
+$as_echo "$at_srcdir/ofproto-dpif.at:5427: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5427"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5428"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5429: ovs-appctl netdev-dummy/receive p2 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=0,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5429"
+$as_echo "$at_srcdir/ofproto-dpif.at:5428: ovs-appctl netdev-dummy/receive p2 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=0,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5428"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p2 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=0,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5429"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5428"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5430: ovs-appctl netdev-dummy/receive p3 'in_port(3),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5430"
+$as_echo "$at_srcdir/ofproto-dpif.at:5429: ovs-appctl netdev-dummy/receive p3 'in_port(3),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5429"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p3 'in_port(3),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5430"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5429"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141542,10 +142025,10 @@
 
 ovs-appctl revalidator/wait
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5432: ovs-appctl dpif/dump-flows br0 | sed 's/ufid:[-0-9a-f]* //' | sed 's/used:[0-9]\\.[0-9]*/used:0.0/' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5432"
+$as_echo "$at_srcdir/ofproto-dpif.at:5431: ovs-appctl dpif/dump-flows br0 | sed 's/ufid:[-0-9a-f]* //' | sed 's/used:[0-9]\\.[0-9]*/used:0.0/' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5431"
 ( $at_check_trace; ovs-appctl dpif/dump-flows br0 | sed 's/ufid:[-0-9a-f]* //' | sed 's/used:[0-9]\.[0-9]*/used:0.0/' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -141553,7 +142036,7 @@
 recirc_id(0),in_port(2),eth_type(0x0800),ipv4(frag=no), packets:0, bytes:0, used:never, actions:drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5432"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5431"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141561,17 +142044,17 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5437: ovs-appctl dpif/dump-flows br1 | sed 's/ufid:[-0-9a-f]* //' | sed 's/used:[0-9]\\.[0-9]*/used:0.0/' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5437"
+$as_echo "$at_srcdir/ofproto-dpif.at:5436: ovs-appctl dpif/dump-flows br1 | sed 's/ufid:[-0-9a-f]* //' | sed 's/used:[0-9]\\.[0-9]*/used:0.0/' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5436"
 ( $at_check_trace; ovs-appctl dpif/dump-flows br1 | sed 's/ufid:[-0-9a-f]* //' | sed 's/used:[0-9]\.[0-9]*/used:0.0/' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "recirc_id(0),in_port(3),eth_type(0x0800),ipv4(frag=no), packets:0, bytes:0, used:never, actions:drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5437"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5436"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141579,10 +142062,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5441: ovs-appctl dpif/dump-flows -m br0 | sed 's/ufid:[-0-9a-f]* //' | sed 's/used:[0-9]\\.[0-9]*/used:0.0/' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5441"
+$as_echo "$at_srcdir/ofproto-dpif.at:5440: ovs-appctl dpif/dump-flows -m br0 | sed 's/ufid:[-0-9a-f]* //' | sed 's/used:[0-9]\\.[0-9]*/used:0.0/' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5440"
 ( $at_check_trace; ovs-appctl dpif/dump-flows -m br0 | sed 's/ufid:[-0-9a-f]* //' | sed 's/used:[0-9]\.[0-9]*/used:0.0/' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -141590,7 +142073,7 @@
 skb_priority(0/0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(p2),eth(src=50:54:00:00:00:07/00:00:00:00:00:00,dst=50:54:00:00:00:05/00:00:00:00:00:00),eth_type(0x0800),ipv4(src=192.168.0.2/0.0.0.0,dst=192.168.0.1/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no),icmp(type=0/0,code=0/0), packets:0, bytes:0, used:never, actions:drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5441"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5440"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141598,17 +142081,17 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5446: ovs-appctl dpif/dump-flows -m br1 | sed 's/ufid:[-0-9a-f]* //' | sed 's/used:[0-9]\\.[0-9]*/used:0.0/' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5446"
+$as_echo "$at_srcdir/ofproto-dpif.at:5445: ovs-appctl dpif/dump-flows -m br1 | sed 's/ufid:[-0-9a-f]* //' | sed 's/used:[0-9]\\.[0-9]*/used:0.0/' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5445"
 ( $at_check_trace; ovs-appctl dpif/dump-flows -m br1 | sed 's/ufid:[-0-9a-f]* //' | sed 's/used:[0-9]\.[0-9]*/used:0.0/' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "skb_priority(0/0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(p3),eth(src=50:54:00:00:00:09/00:00:00:00:00:00,dst=50:54:00:00:00:0a/00:00:00:00:00:00),eth_type(0x0800),ipv4(src=10.0.0.2/0.0.0.0,dst=10.0.0.1/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no),icmp(type=8/0,code=0/0), packets:0, bytes:0, used:never, actions:drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5446"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5445"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141616,45 +142099,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5450: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5450"
+$as_echo "$at_srcdir/ofproto-dpif.at:5449: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5449"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5450"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5449"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5450: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5450"
+$as_echo "$at_srcdir/ofproto-dpif.at:5449: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5449"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5450"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5449"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5450: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5450"
+$as_echo "$at_srcdir/ofproto-dpif.at:5449: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5449"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5450"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5449"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141664,13 +142147,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_877
-#AT_START_878
-at_fn_group_banner 878 'ofproto-dpif.at:5453' \
+#AT_STOP_879
+#AT_START_880
+at_fn_group_banner 880 'ofproto-dpif.at:5452' \
   "ofproto-dpif - ovs-appctl dpif/get-flow" "        " 52
 at_xfail=no
 (
-  $as_echo "878. $at_setup_line: testing $at_desc ..."
+  $as_echo "880. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -141681,29 +142164,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5455: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5455"
+$as_echo "$at_srcdir/ofproto-dpif.at:5454: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5454"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5454"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5455: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5455"
+$as_echo "$at_srcdir/ofproto-dpif.at:5454: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5454"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5454"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -141713,49 +142196,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5455: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5454: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5455"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5454"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5454"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5455: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5455"
+$as_echo "$at_srcdir/ofproto-dpif.at:5454: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5454"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5454"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5455: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5455"
+$as_echo "$at_srcdir/ofproto-dpif.at:5454: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5454"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5454"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -141767,14 +142250,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5455: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5454: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5455"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5454"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -141782,12 +142265,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5454"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141796,19 +142279,19 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5455: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- \\
+$as_echo "$at_srcdir/ofproto-dpif.at:5454: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- \\
                     set bridge br1 datapath-type=dummy fail-mode=secure -- \\
                     set Open_vSwitch . other_config:max-idle=10000 "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5455"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5454"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- \
                     set bridge br1 datapath-type=dummy fail-mode=secure -- \
                     set Open_vSwitch . other_config:max-idle=10000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5455"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5454"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141820,15 +142303,15 @@
     -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5460: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5460"
+$as_echo "$at_srcdir/ofproto-dpif.at:5459: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5459"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5460"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5459"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141836,15 +142319,15 @@
 
 ovs-appctl revalidator/wait
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5462: ovs-appctl dpif/dump-flows -m br0"
-at_fn_check_prepare_trace "ofproto-dpif.at:5462"
+$as_echo "$at_srcdir/ofproto-dpif.at:5461: ovs-appctl dpif/dump-flows -m br0"
+at_fn_check_prepare_trace "ofproto-dpif.at:5461"
 ( $at_check_trace; ovs-appctl dpif/dump-flows -m br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5462"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5461"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141853,17 +142336,17 @@
 
 UFID=`sed -n 's/\(ufid:[-0-9a-fA-F]*\).*/\1/p' stdout`
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5465: ovs-appctl dpctl/get-flow \$UFID"
-at_fn_check_prepare_dynamic "ovs-appctl dpctl/get-flow $UFID" "ofproto-dpif.at:5465"
+$as_echo "$at_srcdir/ofproto-dpif.at:5464: ovs-appctl dpctl/get-flow \$UFID"
+at_fn_check_prepare_dynamic "ovs-appctl dpctl/get-flow $UFID" "ofproto-dpif.at:5464"
 ( $at_check_trace; ovs-appctl dpctl/get-flow $UFID
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "recirc_id(0),in_port(1),eth_type(0x0800),ipv4(frag=no), packets:0, bytes:0, used:never, actions:drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5465"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5464"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141871,45 +142354,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5469: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5469"
+$as_echo "$at_srcdir/ofproto-dpif.at:5468: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5468"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5469"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5468"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5469: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5469"
+$as_echo "$at_srcdir/ofproto-dpif.at:5468: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5468"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5469"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5468"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5469: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5469"
+$as_echo "$at_srcdir/ofproto-dpif.at:5468: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5468"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5469"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5468"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -141919,13 +142402,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_878
-#AT_START_879
-at_fn_group_banner 879 'ofproto-dpif.at:5472' \
+#AT_STOP_880
+#AT_START_881
+at_fn_group_banner 881 'ofproto-dpif.at:5471' \
   "ofproto-dpif - MPLS actions that result in a userspace action" "" 52
 at_xfail=no
 (
-  $as_echo "879. $at_setup_line: testing $at_desc ..."
+  $as_echo "881. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -141935,29 +142418,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5473: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5473"
+$as_echo "$at_srcdir/ofproto-dpif.at:5472: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5472"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5472"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5473: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5473"
+$as_echo "$at_srcdir/ofproto-dpif.at:5472: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5472"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5472"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -141967,49 +142450,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5473: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5472: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5473"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5472"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5472"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5473: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5473"
+$as_echo "$at_srcdir/ofproto-dpif.at:5472: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5472"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5472"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5473: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5473"
+$as_echo "$at_srcdir/ofproto-dpif.at:5472: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5472"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5472"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -142021,14 +142504,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5473: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5472: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5473"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5472"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -142036,12 +142519,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5472"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142050,17 +142533,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5473: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:5472: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5473"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5472"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5472"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142068,15 +142551,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5476: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5476"
+$as_echo "$at_srcdir/ofproto-dpif.at:5475: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5475"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5476"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5475"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142095,15 +142578,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5484: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:5484"
+$as_echo "$at_srcdir/ofproto-dpif.at:5483: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:5483"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5484"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5483"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -142114,15 +142597,15 @@
 
 for dl_src in 00 01; do
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5496: ovs-appctl netdev-dummy/receive p1 \"505400000007 6066666666\$dl_src 8847 00014020 00014120 45 00 00 2c 00 00 00 00 40 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45\""
-at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p1 \"505400000007 6066666666$dl_src 8847 00014020 00014120 45 00 00 2c 00 00 00 00 40 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45\"" "ofproto-dpif.at:5496"
+$as_echo "$at_srcdir/ofproto-dpif.at:5495: ovs-appctl netdev-dummy/receive p1 \"505400000007 6066666666\$dl_src 8847 00014020 00014120 45 00 00 2c 00 00 00 00 40 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45\""
+at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p1 \"505400000007 6066666666$dl_src 8847 00014020 00014120 45 00 00 2c 00 00 00 00 40 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45\"" "ofproto-dpif.at:5495"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 "505400000007 6066666666$dl_src 8847 00014020 00014120 45 00 00 2c 00 00 00 00 40 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5496"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5495"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -142132,16 +142615,16 @@
 done
 sleep 1  # wait for the datapath flow installed
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5499: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
+$as_echo "$at_srcdir/ofproto-dpif.at:5498: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed 's/used:[0-9]\\.[0-9]*/used:0.0/'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5499"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5498"
 ( $at_check_trace; cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed 's/used:[0-9]\.[0-9]*/used:0.0/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -142149,7 +142632,7 @@
 recirc_id=0,mpls,in_port=1,dl_src=60:66:66:66:66:01,mpls_bos=0,mpls_lse1=82208, actions:userspace(pid=0,slow_path(controller))
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5499"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5498"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -142158,15 +142641,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5504: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5504"
+$as_echo "$at_srcdir/ofproto-dpif.at:5503: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5503"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5504"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5503"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -142174,15 +142657,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5504: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5504"
+$as_echo "$at_srcdir/ofproto-dpif.at:5503: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5503"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5504"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5503"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -142190,15 +142673,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5504: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5504"
+$as_echo "$at_srcdir/ofproto-dpif.at:5503: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5503"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5504"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5503"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -142209,13 +142692,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_879
-#AT_START_880
-at_fn_group_banner 880 'ofproto-dpif.at:5508' \
+#AT_STOP_881
+#AT_START_882
+at_fn_group_banner 882 'ofproto-dpif.at:5507' \
   "ofproto-dpif - MPLS actions that result in a drop" "" 52
 at_xfail=no
 (
-  $as_echo "880. $at_setup_line: testing $at_desc ..."
+  $as_echo "882. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -142225,29 +142708,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5509: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5509"
+$as_echo "$at_srcdir/ofproto-dpif.at:5508: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5508"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5509"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5508"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5509: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5509"
+$as_echo "$at_srcdir/ofproto-dpif.at:5508: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5508"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5509"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5508"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -142257,49 +142740,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5509: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5508: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5509"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5508"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5509"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5508"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5509: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5509"
+$as_echo "$at_srcdir/ofproto-dpif.at:5508: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5508"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5509"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5508"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5509: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5509"
+$as_echo "$at_srcdir/ofproto-dpif.at:5508: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5508"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5509"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5508"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -142311,14 +142794,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5509: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5508: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5509"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5508"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -142326,12 +142809,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5509"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5508"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142340,17 +142823,17 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5509: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
+$as_echo "$at_srcdir/ofproto-dpif.at:5508: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
  "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5509"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5508"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --    add-port br0 p1 -- set Interface p1 type=dummy
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5509"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5508"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142358,15 +142841,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5512: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5512"
+$as_echo "$at_srcdir/ofproto-dpif.at:5511: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5511"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5512"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5511"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142385,15 +142868,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5520: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:5520"
+$as_echo "$at_srcdir/ofproto-dpif.at:5519: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:5519"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5520"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5519"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -142404,15 +142887,15 @@
 
 for dl_src in 00 01; do
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5535: ovs-appctl netdev-dummy/receive p1 \"505400000007 6066666666\$dl_src 8847 00014020 00014120 45 00 00 2c 00 00 00 00 40 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45\""
-at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p1 \"505400000007 6066666666$dl_src 8847 00014020 00014120 45 00 00 2c 00 00 00 00 40 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45\"" "ofproto-dpif.at:5535"
+$as_echo "$at_srcdir/ofproto-dpif.at:5534: ovs-appctl netdev-dummy/receive p1 \"505400000007 6066666666\$dl_src 8847 00014020 00014120 45 00 00 2c 00 00 00 00 40 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45\""
+at_fn_check_prepare_dynamic "ovs-appctl netdev-dummy/receive p1 \"505400000007 6066666666$dl_src 8847 00014020 00014120 45 00 00 2c 00 00 00 00 40 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45\"" "ofproto-dpif.at:5534"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 "505400000007 6066666666$dl_src 8847 00014020 00014120 45 00 00 2c 00 00 00 00 40 06 3b 78 c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44 00 00 48 4f 47 45"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5535"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5534"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -142422,16 +142905,16 @@
 done
 sleep 1  # wait for the datapath flow installed
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5538: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
+$as_echo "$at_srcdir/ofproto-dpif.at:5537: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed 's/used:[0-9]\\.[0-9]*/used:0.0/'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5538"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5537"
 ( $at_check_trace; cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed 's/used:[0-9]\.[0-9]*/used:0.0/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -142439,7 +142922,7 @@
 recirc_id=0,mpls,in_port=1,dl_src=60:66:66:66:66:01,mpls_bos=0,mpls_lse1=82208, actions:userspace(pid=0,slow_path(controller))
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5538"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5537"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -142448,15 +142931,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5543: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5543"
+$as_echo "$at_srcdir/ofproto-dpif.at:5542: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5542"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5543"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5542"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -142464,15 +142947,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5543: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5543"
+$as_echo "$at_srcdir/ofproto-dpif.at:5542: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5542"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5543"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5542"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -142480,15 +142963,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5543: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5543"
+$as_echo "$at_srcdir/ofproto-dpif.at:5542: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5542"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5543"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5542"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -142499,13 +142982,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_880
-#AT_START_881
-at_fn_group_banner 881 'ofproto-dpif.at:5546' \
+#AT_STOP_882
+#AT_START_883
+at_fn_group_banner 883 'ofproto-dpif.at:5545' \
   "ofproto-dpif - patch ports" "                     " 52
 at_xfail=no
 (
-  $as_echo "881. $at_setup_line: testing $at_desc ..."
+  $as_echo "883. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -142515,29 +142998,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5547: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5547"
+$as_echo "$at_srcdir/ofproto-dpif.at:5546: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5546"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5547"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5546"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5547: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5547"
+$as_echo "$at_srcdir/ofproto-dpif.at:5546: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5546"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5547"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5546"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -142547,49 +143030,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5547: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5546: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5547"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5546"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5547"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5546"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5547: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5547"
+$as_echo "$at_srcdir/ofproto-dpif.at:5546: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5546"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5547"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5546"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5547: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5547"
+$as_echo "$at_srcdir/ofproto-dpif.at:5546: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5546"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5547"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5546"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -142601,14 +143084,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5547: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5546: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5547"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5546"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -142616,12 +143099,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5547"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5546"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142630,21 +143113,21 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5547: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 \\
+$as_echo "$at_srcdir/ofproto-dpif.at:5546: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 \\
 -- set bridge br1 datapath-type=dummy fail-mode=secure \\
 -- add-port br1 pbr1 -- set int pbr1 type=patch options:peer=pbr0 \\
 -- add-port br0 pbr0 -- set int pbr0 type=patch options:peer=pbr1 "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5547"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5546"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 \
 -- set bridge br1 datapath-type=dummy fail-mode=secure \
 -- add-port br1 pbr1 -- set int pbr1 type=patch options:peer=pbr0 \
 -- add-port br0 pbr0 -- set int pbr0 type=patch options:peer=pbr1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5547"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5546"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142658,47 +143141,47 @@
     -- add-port br1 p3 -- set Interface p3 type=dummy ofport_request=3
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5555: ovs-appctl upcall/disable-ufid"
-at_fn_check_prepare_trace "ofproto-dpif.at:5555"
+$as_echo "$at_srcdir/ofproto-dpif.at:5554: ovs-appctl upcall/disable-ufid"
+at_fn_check_prepare_trace "ofproto-dpif.at:5554"
 ( $at_check_trace; ovs-appctl upcall/disable-ufid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath dumping tersely using UFID disabled
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5555"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5554"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5557: ovs-appctl time/stop"
-at_fn_check_prepare_trace "ofproto-dpif.at:5557"
+$as_echo "$at_srcdir/ofproto-dpif.at:5556: ovs-appctl time/stop"
+at_fn_check_prepare_trace "ofproto-dpif.at:5556"
 ( $at_check_trace; ovs-appctl time/stop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5557"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5556"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5558: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5558"
+$as_echo "$at_srcdir/ofproto-dpif.at:5557: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5557"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5558"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5557"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142706,30 +143189,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5560: ovs-ofctl add-flow br0 actions=LOCAL,output:1,output:2"
-at_fn_check_prepare_trace "ofproto-dpif.at:5560"
+$as_echo "$at_srcdir/ofproto-dpif.at:5559: ovs-ofctl add-flow br0 actions=LOCAL,output:1,output:2"
+at_fn_check_prepare_trace "ofproto-dpif.at:5559"
 ( $at_check_trace; ovs-ofctl add-flow br0 actions=LOCAL,output:1,output:2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5560"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5559"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5561: ovs-ofctl add-flow br1 actions=LOCAL,output:1,output:3"
-at_fn_check_prepare_trace "ofproto-dpif.at:5561"
+$as_echo "$at_srcdir/ofproto-dpif.at:5560: ovs-ofctl add-flow br1 actions=LOCAL,output:1,output:3"
+at_fn_check_prepare_trace "ofproto-dpif.at:5560"
 ( $at_check_trace; ovs-ofctl add-flow br1 actions=LOCAL,output:1,output:3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5561"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5560"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142751,17 +143234,17 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5577: ovs-appctl time/warp 500"
-at_fn_check_prepare_trace "ofproto-dpif.at:5577"
+$as_echo "$at_srcdir/ofproto-dpif.at:5576: ovs-appctl time/warp 500"
+at_fn_check_prepare_trace "ofproto-dpif.at:5576"
 ( $at_check_trace; ovs-appctl time/warp 500
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "warped
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5577"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5576"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142770,10 +143253,10 @@
 sleep 1  # wait for log writer
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5582: ovs-appctl dpif/show"
-at_fn_check_prepare_trace "ofproto-dpif.at:5582"
+$as_echo "$at_srcdir/ofproto-dpif.at:5581: ovs-appctl dpif/show"
+at_fn_check_prepare_trace "ofproto-dpif.at:5581"
 ( $at_check_trace; ovs-appctl dpif/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -142788,7 +143271,7 @@
 		pbr1 1/none: (patch: peer=pbr0)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5582"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5581"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142796,16 +143279,16 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5594: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
+$as_echo "$at_srcdir/ofproto-dpif.at:5593: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed 's/used:[0-9]\\.[0-9]*/used:0.0/'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5594"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5593"
 ( $at_check_trace; cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed 's/used:[0-9]\.[0-9]*/used:0.0/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -142813,7 +143296,7 @@
 recirc_id=0,ip,in_port=101,nw_frag=no, actions:100,2,3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5594"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5593"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142821,50 +143304,50 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5599: cat ovs-vswitchd.log | grep -e 'in_port(100).*packets:9' | sed 's/ufid:[-0-9a-f]* //' |
+$as_echo "$at_srcdir/ofproto-dpif.at:5598: cat ovs-vswitchd.log | grep -e 'in_port(100).*packets:9' | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_dump ' | sed '
     s/.*flow_dump //
     s/used:[0-9]*\\.[0-9]*/used:0.0/
 ' | sort | uniq"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5599"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5598"
 ( $at_check_trace; cat ovs-vswitchd.log | grep -e 'in_port(100).*packets:9' | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_dump ' | sed '
     s/.*flow_dump //
     s/used:[0-9]*\.[0-9]*/used:0.0/
 ' | sort | uniq
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "skb_priority(0/0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(100),eth(src=50:54:00:00:00:05/00:00:00:00:00:00,dst=50:54:00:00:00:07/00:00:00:00:00:00),eth_type(0x0800),ipv4(src=192.168.0.1/0.0.0.0,dst=192.168.0.2/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no),icmp(type=8/0,code=0/0), packets:9, bytes:540, used:0.0s, actions:101,3,2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5599"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5598"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5602: cat ovs-vswitchd.log | grep -e 'in_port(101).*packets:4' | sed 's/ufid:[-0-9a-f]* //' |
+$as_echo "$at_srcdir/ofproto-dpif.at:5601: cat ovs-vswitchd.log | grep -e 'in_port(101).*packets:4' | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_dump ' | sed '
     s/.*flow_dump //
     s/used:[0-9]*\\.[0-9]*/used:0.0/
 ' | sort | uniq"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5602"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5601"
 ( $at_check_trace; cat ovs-vswitchd.log | grep -e 'in_port(101).*packets:4' | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_dump ' | sed '
     s/.*flow_dump //
     s/used:[0-9]*\.[0-9]*/used:0.0/
 ' | sort | uniq
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "skb_priority(0/0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(101),eth(src=50:54:00:00:00:07/00:00:00:00:00:00,dst=50:54:00:00:00:05/00:00:00:00:00:00),eth_type(0x0800),ipv4(src=192.168.0.2/0.0.0.0,dst=192.168.0.1/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no),icmp(type=8/0,code=0/0), packets:4, bytes:240, used:0.0s, actions:100,2,3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5602"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5601"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142872,10 +143355,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5606: ovs-ofctl dump-ports br0 pbr0"
-at_fn_check_prepare_trace "ofproto-dpif.at:5606"
+$as_echo "$at_srcdir/ofproto-dpif.at:5605: ovs-ofctl dump-ports br0 pbr0"
+at_fn_check_prepare_trace "ofproto-dpif.at:5605"
 ( $at_check_trace; ovs-ofctl dump-ports br0 pbr0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -142884,7 +143367,7 @@
            tx pkts=10, bytes=600, drop=0, errs=0, coll=0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5606"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5605"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142892,10 +143375,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5612: ovs-ofctl dump-ports br1 pbr1"
-at_fn_check_prepare_trace "ofproto-dpif.at:5612"
+$as_echo "$at_srcdir/ofproto-dpif.at:5611: ovs-ofctl dump-ports br1 pbr1"
+at_fn_check_prepare_trace "ofproto-dpif.at:5611"
 ( $at_check_trace; ovs-ofctl dump-ports br1 pbr1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -142904,7 +143387,7 @@
            tx pkts=5, bytes=300, drop=0, errs=0, coll=0
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5612"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5611"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142912,45 +143395,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5618: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5618"
+$as_echo "$at_srcdir/ofproto-dpif.at:5617: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5617"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5618"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5617"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5618: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5618"
+$as_echo "$at_srcdir/ofproto-dpif.at:5617: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5617"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5618"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5617"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5618: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5618"
+$as_echo "$at_srcdir/ofproto-dpif.at:5617: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5617"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5618"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5617"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -142960,13 +143443,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_881
-#AT_START_882
-at_fn_group_banner 882 'ofproto-dpif.at:5621' \
+#AT_STOP_883
+#AT_START_884
+at_fn_group_banner 884 'ofproto-dpif.at:5620' \
   "ofproto-dpif - patch ports - stack" "             " 52
 at_xfail=no
 (
-  $as_echo "882. $at_setup_line: testing $at_desc ..."
+  $as_echo "884. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -142976,29 +143459,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5622: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5622"
+$as_echo "$at_srcdir/ofproto-dpif.at:5621: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5621"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5622"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5621"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5622: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5622"
+$as_echo "$at_srcdir/ofproto-dpif.at:5621: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5621"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5622"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5621"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -143008,49 +143491,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5622: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5621: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5622"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5621"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5622"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5621"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5622: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5622"
+$as_echo "$at_srcdir/ofproto-dpif.at:5621: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5621"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5622"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5621"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5622: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5622"
+$as_echo "$at_srcdir/ofproto-dpif.at:5621: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5621"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5622"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5621"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -143062,14 +143545,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5622: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5621: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5622"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5621"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -143077,12 +143560,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5622"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5621"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143091,21 +143574,21 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5622: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 \\
+$as_echo "$at_srcdir/ofproto-dpif.at:5621: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 \\
 -- set bridge br1 datapath-type=dummy fail-mode=secure \\
 -- add-port br1 pbr1 -- set int pbr1 type=patch options:peer=pbr0 \\
 -- add-port br0 pbr0 -- set int pbr0 type=patch options:peer=pbr1 "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5622"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5621"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 \
 -- set bridge br1 datapath-type=dummy fail-mode=secure \
 -- add-port br1 pbr1 -- set int pbr1 type=patch options:peer=pbr0 \
 -- add-port br0 pbr0 -- set int pbr0 type=patch options:peer=pbr1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5622"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5621"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143119,47 +143602,47 @@
     -- add-port br1 p3 -- set Interface p3 type=dummy ofport_request=3
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5630: ovs-appctl upcall/disable-ufid"
-at_fn_check_prepare_trace "ofproto-dpif.at:5630"
+$as_echo "$at_srcdir/ofproto-dpif.at:5629: ovs-appctl upcall/disable-ufid"
+at_fn_check_prepare_trace "ofproto-dpif.at:5629"
 ( $at_check_trace; ovs-appctl upcall/disable-ufid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath dumping tersely using UFID disabled
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5630"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5629"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5632: ovs-appctl time/stop"
-at_fn_check_prepare_trace "ofproto-dpif.at:5632"
+$as_echo "$at_srcdir/ofproto-dpif.at:5631: ovs-appctl time/stop"
+at_fn_check_prepare_trace "ofproto-dpif.at:5631"
 ( $at_check_trace; ovs-appctl time/stop
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5632"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5631"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5633: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5633"
+$as_echo "$at_srcdir/ofproto-dpif.at:5632: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5632"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5633"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5632"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143167,15 +143650,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5635: ovs-ofctl add-flow br0 \"ip actions=push:OXM_OF_IN_PORT[0..31],output:1,pop:OXM_OF_IPV4_SRC[0..31],output:2\""
-at_fn_check_prepare_trace "ofproto-dpif.at:5635"
+$as_echo "$at_srcdir/ofproto-dpif.at:5634: ovs-ofctl add-flow br0 \"ip actions=push:OXM_OF_IN_PORT[0..31],output:1,pop:OXM_OF_IPV4_SRC[0..31],output:2\""
+at_fn_check_prepare_trace "ofproto-dpif.at:5634"
 ( $at_check_trace; ovs-ofctl add-flow br0 "ip actions=push:OXM_OF_IN_PORT[0..31],output:1,pop:OXM_OF_IPV4_SRC[0..31],output:2"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5635"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5634"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143183,15 +143666,15 @@
 
 # Try to pop from empty stack, and push and leave data to stack.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5637: ovs-ofctl add-flow br1 \"ip actions=pop:OXM_OF_IPV4_DST[0..31],push:NXM_NX_REG1[0..31],LOCAL\""
-at_fn_check_prepare_trace "ofproto-dpif.at:5637"
+$as_echo "$at_srcdir/ofproto-dpif.at:5636: ovs-ofctl add-flow br1 \"ip actions=pop:OXM_OF_IPV4_DST[0..31],push:NXM_NX_REG1[0..31],LOCAL\""
+at_fn_check_prepare_trace "ofproto-dpif.at:5636"
 ( $at_check_trace; ovs-ofctl add-flow br1 "ip actions=pop:OXM_OF_IPV4_DST[0..31],push:NXM_NX_REG1[0..31],LOCAL"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5636"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143201,17 +143684,17 @@
 ovs-appctl netdev-dummy/receive br0 'in_port(100),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5641: ovs-appctl time/warp 500"
-at_fn_check_prepare_trace "ofproto-dpif.at:5641"
+$as_echo "$at_srcdir/ofproto-dpif.at:5640: ovs-appctl time/warp 500"
+at_fn_check_prepare_trace "ofproto-dpif.at:5640"
 ( $at_check_trace; ovs-appctl time/warp 500
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "warped
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5641"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5640"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143219,19 +143702,19 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5645: ovs_wait_cond () { test \`grep flow_add ovs-vswitchd.log | wc -l\` -ge 1
+$as_echo "$at_srcdir/ofproto-dpif.at:5644: ovs_wait_cond () { test \`grep flow_add ovs-vswitchd.log | wc -l\` -ge 1
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:5645"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:5644"
 ( $at_check_trace; ovs_wait_cond () { test `grep flow_add ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5645"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5644"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143239,10 +143722,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5647: ovs-appctl dpif/show"
-at_fn_check_prepare_trace "ofproto-dpif.at:5647"
+$as_echo "$at_srcdir/ofproto-dpif.at:5646: ovs-appctl dpif/show"
+at_fn_check_prepare_trace "ofproto-dpif.at:5646"
 ( $at_check_trace; ovs-appctl dpif/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -143257,7 +143740,7 @@
 		pbr1 1/none: (patch: peer=pbr0)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5647"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5646"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143265,23 +143748,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5659: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
+$as_echo "$at_srcdir/ofproto-dpif.at:5658: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed 's/used:[0-9]\\.[0-9]*/used:0.0/'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5659"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5658"
 ( $at_check_trace; cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed 's/used:[0-9]\.[0-9]*/used:0.0/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "recirc_id=0,ip,in_port=100,nw_src=192.168.0.1,nw_frag=no, actions:101,set(ipv4(src=255.255.255.254)),2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5659"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5658"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143289,17 +143772,17 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5663: cat ovs-vswitchd.log | grep -e '|nx_match|WARN|' | sed \"s/^.*|WARN|//\""
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5663"
+$as_echo "$at_srcdir/ofproto-dpif.at:5662: cat ovs-vswitchd.log | grep -e '|nx_match|WARN|' | sed \"s/^.*|WARN|//\""
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:5662"
 ( $at_check_trace; cat ovs-vswitchd.log | grep -e '|nx_match|WARN|' | sed "s/^.*|WARN|//"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Failed to pop from an empty stack. On flow
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5663"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5662"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143307,45 +143790,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5667: check_logs \"/Failed to pop from an empty stack/d\""
-at_fn_check_prepare_trace "ofproto-dpif.at:5667"
+$as_echo "$at_srcdir/ofproto-dpif.at:5666: check_logs \"/Failed to pop from an empty stack/d\""
+at_fn_check_prepare_trace "ofproto-dpif.at:5666"
 ( $at_check_trace; check_logs "/Failed to pop from an empty stack/d"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5667"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5666"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5667: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5667"
+$as_echo "$at_srcdir/ofproto-dpif.at:5666: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5666"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5667"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5666"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5667: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5667"
+$as_echo "$at_srcdir/ofproto-dpif.at:5666: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5666"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5667"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5666"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143355,13 +143838,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_882
-#AT_START_883
-at_fn_group_banner 883 'ofproto-dpif.at:5670' \
+#AT_STOP_884
+#AT_START_885
+at_fn_group_banner 885 'ofproto-dpif.at:5669' \
   "ofproto-dpif - port duration" "                   " 52
 at_xfail=no
 (
-  $as_echo "883. $at_setup_line: testing $at_desc ..."
+  $as_echo "885. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -143371,29 +143854,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5671: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5671"
+$as_echo "$at_srcdir/ofproto-dpif.at:5670: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5670"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5671"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5670"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5671: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5671"
+$as_echo "$at_srcdir/ofproto-dpif.at:5670: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5670"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5671"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5670"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -143403,49 +143886,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5671: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5670: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5671"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5670"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5671"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5670"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5671: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5671"
+$as_echo "$at_srcdir/ofproto-dpif.at:5670: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5670"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5671"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5670"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5671: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5671"
+$as_echo "$at_srcdir/ofproto-dpif.at:5670: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5670"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5671"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5670"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -143457,14 +143940,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5671: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5670: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5671"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5670"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -143472,12 +143955,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5671"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5670"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143486,15 +143969,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5671: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 protocols=OpenFlow13 "
-at_fn_check_prepare_trace "ofproto-dpif.at:5671"
+$as_echo "$at_srcdir/ofproto-dpif.at:5670: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 protocols=OpenFlow13 "
+at_fn_check_prepare_trace "ofproto-dpif.at:5670"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 protocols=OpenFlow13
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5671"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5670"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143509,25 +143992,25 @@
 ovs-appctl time/warp 10000
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5677: ovs-ofctl -O openflow13 dump-ports br0"
-at_fn_check_prepare_trace "ofproto-dpif.at:5677"
+$as_echo "$at_srcdir/ofproto-dpif.at:5676: ovs-ofctl -O openflow13 dump-ports br0"
+at_fn_check_prepare_trace "ofproto-dpif.at:5676"
 ( $at_check_trace; ovs-ofctl -O openflow13 dump-ports br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5677"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5676"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5678: sed -n 's/=[0-9][0-9]\\(\\.[0-9][0-9]*\\)\\{0,1\\}s/=?s/p' stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:5678"
+$as_echo "$at_srcdir/ofproto-dpif.at:5677: sed -n 's/=[0-9][0-9]\\(\\.[0-9][0-9]*\\)\\{0,1\\}s/=?s/p' stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:5677"
 ( $at_check_trace; sed -n 's/=[0-9][0-9]\(\.[0-9][0-9]*\)\{0,1\}s/=?s/p' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -143536,52 +144019,52 @@
            duration=?s
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5678"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5677"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5684: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5684"
+$as_echo "$at_srcdir/ofproto-dpif.at:5683: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5683"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5684"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5683"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5684: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5684"
+$as_echo "$at_srcdir/ofproto-dpif.at:5683: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5683"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5684"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5683"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5684: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5684"
+$as_echo "$at_srcdir/ofproto-dpif.at:5683: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5683"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5684"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5683"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143591,13 +144074,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_883
-#AT_START_884
-at_fn_group_banner 884 'ofproto-dpif.at:5690' \
+#AT_STOP_885
+#AT_START_886
+at_fn_group_banner 886 'ofproto-dpif.at:5689' \
   "ofproto-dpif megaflow - port classification" "    " 53
 at_xfail=no
 (
-  $as_echo "884. $at_setup_line: testing $at_desc ..."
+  $as_echo "886. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -143607,29 +144090,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5691: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5691"
+$as_echo "$at_srcdir/ofproto-dpif.at:5690: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5690"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5690"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5691: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5691"
+$as_echo "$at_srcdir/ofproto-dpif.at:5690: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5690"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5690"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -143639,49 +144122,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5691: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5690: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5691"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5690"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5690"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5691: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5691"
+$as_echo "$at_srcdir/ofproto-dpif.at:5690: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5690"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5690"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5691: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5691"
+$as_echo "$at_srcdir/ofproto-dpif.at:5690: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5690"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5690"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -143693,14 +144176,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5691: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5690: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5691"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5690"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -143708,12 +144191,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5690"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143722,15 +144205,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5691: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5691"
+$as_echo "$at_srcdir/ofproto-dpif.at:5690: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5690"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5690"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143738,15 +144221,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5692: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5692"
+$as_echo "$at_srcdir/ofproto-dpif.at:5691: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5691"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5692"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5691"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143760,30 +144243,30 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5697: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:5697"
+$as_echo "$at_srcdir/ofproto-dpif.at:5696: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:5696"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5697"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5696"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5698: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5698"
+$as_echo "$at_srcdir/ofproto-dpif.at:5697: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5697"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5698"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5697"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143791,15 +144274,15 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5700: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5700"
+$as_echo "$at_srcdir/ofproto-dpif.at:5699: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5699"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5700"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5699"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143807,7 +144290,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5702: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5701: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -143817,7 +144300,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5702"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5701"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -143828,59 +144311,59 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "recirc_id=0,ip,in_port=1,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5702"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5701"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5705: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5705"
+$as_echo "$at_srcdir/ofproto-dpif.at:5704: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5704"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5705"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5704"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5705: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5705"
+$as_echo "$at_srcdir/ofproto-dpif.at:5704: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5704"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5705"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5704"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5705: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5705"
+$as_echo "$at_srcdir/ofproto-dpif.at:5704: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5704"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5705"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5704"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -143890,13 +144373,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_884
-#AT_START_885
-at_fn_group_banner 885 'ofproto-dpif.at:5708' \
+#AT_STOP_886
+#AT_START_887
+at_fn_group_banner 887 'ofproto-dpif.at:5707' \
   "ofproto-dpif megaflow - L2 classification" "      " 53
 at_xfail=no
 (
-  $as_echo "885. $at_setup_line: testing $at_desc ..."
+  $as_echo "887. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -143906,29 +144389,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5709: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5709"
+$as_echo "$at_srcdir/ofproto-dpif.at:5708: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5708"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5709"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5708"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5709: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5709"
+$as_echo "$at_srcdir/ofproto-dpif.at:5708: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5708"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5709"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5708"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -143938,49 +144421,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5709: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5708: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5709"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5708"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5709"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5708"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5709: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5709"
+$as_echo "$at_srcdir/ofproto-dpif.at:5708: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5708"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5709"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5708"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5709: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5709"
+$as_echo "$at_srcdir/ofproto-dpif.at:5708: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5708"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5709"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5708"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -143992,14 +144475,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5709: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5708: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5709"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5708"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -144007,12 +144490,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5709"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5708"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144021,15 +144504,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5709: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5709"
+$as_echo "$at_srcdir/ofproto-dpif.at:5708: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5708"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5709"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5708"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144037,15 +144520,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5710: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5710"
+$as_echo "$at_srcdir/ofproto-dpif.at:5709: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5709"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5710"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5709"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144059,45 +144542,45 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5715: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:5715"
+$as_echo "$at_srcdir/ofproto-dpif.at:5714: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:5714"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5715"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5714"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5716: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5716"
+$as_echo "$at_srcdir/ofproto-dpif.at:5715: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5715"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5716"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5715"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5717: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5717"
+$as_echo "$at_srcdir/ofproto-dpif.at:5716: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5716"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5717"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5716"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144105,7 +144588,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5719: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5718: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -144115,7 +144598,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5719"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5718"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -144126,7 +144609,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -144134,52 +144617,52 @@
 recirc_id=0,ip,in_port=1,dl_src=50:54:00:00:00:0b/ff:ff:00:00:00:02,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5719"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5718"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5723: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5723"
+$as_echo "$at_srcdir/ofproto-dpif.at:5722: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5722"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5723"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5722"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5723: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5723"
+$as_echo "$at_srcdir/ofproto-dpif.at:5722: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5722"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5723"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5722"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5723: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5723"
+$as_echo "$at_srcdir/ofproto-dpif.at:5722: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5722"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5723"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5722"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144189,13 +144672,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_885
-#AT_START_886
-at_fn_group_banner 886 'ofproto-dpif.at:5726' \
+#AT_STOP_887
+#AT_START_888
+at_fn_group_banner 888 'ofproto-dpif.at:5725' \
   "ofproto-dpif megaflow - L3 classification" "      " 53
 at_xfail=no
 (
-  $as_echo "886. $at_setup_line: testing $at_desc ..."
+  $as_echo "888. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -144205,29 +144688,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5727: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5727"
+$as_echo "$at_srcdir/ofproto-dpif.at:5726: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5726"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5727"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5726"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5727: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5727"
+$as_echo "$at_srcdir/ofproto-dpif.at:5726: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5726"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5727"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5726"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -144237,49 +144720,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5727: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5726: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5727"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5726"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5727"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5726"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5727: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5727"
+$as_echo "$at_srcdir/ofproto-dpif.at:5726: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5726"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5727"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5726"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5727: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5727"
+$as_echo "$at_srcdir/ofproto-dpif.at:5726: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5726"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5727"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5726"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -144291,14 +144774,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5727: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5726: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5727"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5726"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -144306,12 +144789,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5727"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5726"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144320,15 +144803,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5727: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5727"
+$as_echo "$at_srcdir/ofproto-dpif.at:5726: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5726"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5727"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5726"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144336,15 +144819,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5728: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5728"
+$as_echo "$at_srcdir/ofproto-dpif.at:5727: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5727"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5728"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5727"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144354,15 +144837,15 @@
     -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
     -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5730: ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0 prefixes=nw_dst,nw_src"
-at_fn_check_prepare_trace "ofproto-dpif.at:5730"
+$as_echo "$at_srcdir/ofproto-dpif.at:5729: ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0 prefixes=nw_dst,nw_src"
+at_fn_check_prepare_trace "ofproto-dpif.at:5729"
 ( $at_check_trace; ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0 prefixes=nw_dst,nw_src
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5730"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5729"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144373,45 +144856,45 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5734: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:5734"
+$as_echo "$at_srcdir/ofproto-dpif.at:5733: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:5733"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5734"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5733"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5735: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5735"
+$as_echo "$at_srcdir/ofproto-dpif.at:5734: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5734"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5735"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5734"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5736: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5736"
+$as_echo "$at_srcdir/ofproto-dpif.at:5735: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5735"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5736"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5735"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144419,7 +144902,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5738: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5737: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -144429,7 +144912,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5738"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5737"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -144440,7 +144923,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -144448,52 +144931,52 @@
 recirc_id=0,ip,in_port=1,nw_src=10.0.0.2/0.0.0.2,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5738"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5737"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5742: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5742"
+$as_echo "$at_srcdir/ofproto-dpif.at:5741: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5741"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5742"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5741"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5742: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5742"
+$as_echo "$at_srcdir/ofproto-dpif.at:5741: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5741"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5742"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5741"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5742: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5742"
+$as_echo "$at_srcdir/ofproto-dpif.at:5741: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5741"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5742"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5741"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144503,13 +144986,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_886
-#AT_START_887
-at_fn_group_banner 887 'ofproto-dpif.at:5745' \
+#AT_STOP_888
+#AT_START_889
+at_fn_group_banner 889 'ofproto-dpif.at:5744' \
   "ofproto-dpif megaflow - IPv6 classification" "    " 53
 at_xfail=no
 (
-  $as_echo "887. $at_setup_line: testing $at_desc ..."
+  $as_echo "889. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -144519,29 +145002,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5746: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5746"
+$as_echo "$at_srcdir/ofproto-dpif.at:5745: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5745"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5746"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5745"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5746: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5746"
+$as_echo "$at_srcdir/ofproto-dpif.at:5745: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5745"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5746"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5745"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -144551,49 +145034,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5746: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5745: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5746"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5745"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5746"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5745"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5746: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5746"
+$as_echo "$at_srcdir/ofproto-dpif.at:5745: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5745"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5746"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5745"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5746: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5746"
+$as_echo "$at_srcdir/ofproto-dpif.at:5745: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5745"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5746"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5745"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -144605,14 +145088,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5746: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5745: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5746"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5745"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -144620,12 +145103,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5746"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5745"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144634,15 +145117,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5746: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5746"
+$as_echo "$at_srcdir/ofproto-dpif.at:5745: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5745"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5746"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5745"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144650,15 +145133,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5747: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5747"
+$as_echo "$at_srcdir/ofproto-dpif.at:5746: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5746"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5747"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5746"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144668,15 +145151,15 @@
     -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
     -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5749: ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0 prefixes=ipv6_dst,ipv6_src"
-at_fn_check_prepare_trace "ofproto-dpif.at:5749"
+$as_echo "$at_srcdir/ofproto-dpif.at:5748: ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0 prefixes=ipv6_dst,ipv6_src"
+at_fn_check_prepare_trace "ofproto-dpif.at:5748"
 ( $at_check_trace; ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0 prefixes=ipv6_dst,ipv6_src
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5749"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5748"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144687,45 +145170,45 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5753: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:5753"
+$as_echo "$at_srcdir/ofproto-dpif.at:5752: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:5752"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5753"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5752"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5754: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x86dd),ipv6(src=2001:db8:3c4d:1:2:3:4:5,dst=fe80::2,label=0,proto=10,tclass=0x70,hlimit=128,frag=no)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5754"
+$as_echo "$at_srcdir/ofproto-dpif.at:5753: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x86dd),ipv6(src=2001:db8:3c4d:1:2:3:4:5,dst=fe80::2,label=0,proto=10,tclass=0x70,hlimit=128,frag=no)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5753"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x86dd),ipv6(src=2001:db8:3c4d:1:2:3:4:5,dst=fe80::2,label=0,proto=10,tclass=0x70,hlimit=128,frag=no)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5754"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5753"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5755: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x86dd),ipv6(src=2001:db8:3c4d:5:4:3:2:1,dst=2001:db8:3c4d:1:2:3:4:1,label=0,proto=99,tclass=0x70,hlimit=64,frag=no)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5755"
+$as_echo "$at_srcdir/ofproto-dpif.at:5754: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x86dd),ipv6(src=2001:db8:3c4d:5:4:3:2:1,dst=2001:db8:3c4d:1:2:3:4:1,label=0,proto=99,tclass=0x70,hlimit=64,frag=no)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5754"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x86dd),ipv6(src=2001:db8:3c4d:5:4:3:2:1,dst=2001:db8:3c4d:1:2:3:4:1,label=0,proto=99,tclass=0x70,hlimit=64,frag=no)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5755"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5754"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144733,7 +145216,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5757: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5756: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -144743,7 +145226,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5757"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5756"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -144754,7 +145237,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -144762,52 +145245,52 @@
 recirc_id=0,ipv6,in_port=1,ipv6_src=2001:db8:3c4d:5:4:3:2:1/0:0:0:4::,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5757"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5756"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5761: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5761"
+$as_echo "$at_srcdir/ofproto-dpif.at:5760: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5760"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5760"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5761: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5761"
+$as_echo "$at_srcdir/ofproto-dpif.at:5760: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5760"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5760"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5761: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5761"
+$as_echo "$at_srcdir/ofproto-dpif.at:5760: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5760"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5761"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5760"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144817,13 +145300,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_887
-#AT_START_888
-at_fn_group_banner 888 'ofproto-dpif.at:5764' \
+#AT_STOP_889
+#AT_START_890
+at_fn_group_banner 890 'ofproto-dpif.at:5763' \
   "ofproto-dpif megaflow - L4 classification" "      " 53
 at_xfail=no
 (
-  $as_echo "888. $at_setup_line: testing $at_desc ..."
+  $as_echo "890. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -144833,29 +145316,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5765: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5765"
+$as_echo "$at_srcdir/ofproto-dpif.at:5764: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5764"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5765"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5764"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5765: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5765"
+$as_echo "$at_srcdir/ofproto-dpif.at:5764: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5764"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5765"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5764"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -144865,49 +145348,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5765: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5764: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5765"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5764"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5765"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5764"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5765: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5765"
+$as_echo "$at_srcdir/ofproto-dpif.at:5764: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5764"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5765"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5764"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5765: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5765"
+$as_echo "$at_srcdir/ofproto-dpif.at:5764: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5764"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5765"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5764"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -144919,14 +145402,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5765: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5764: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5765"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5764"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -144934,12 +145417,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5765"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5764"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144948,15 +145431,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5765: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5765"
+$as_echo "$at_srcdir/ofproto-dpif.at:5764: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5764"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5765"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5764"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144964,15 +145447,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5766: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5766"
+$as_echo "$at_srcdir/ofproto-dpif.at:5765: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5765"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5766"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5765"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -144986,30 +145469,30 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5771: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:5771"
+$as_echo "$at_srcdir/ofproto-dpif.at:5770: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:5770"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5771"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5770"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5772: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5772"
+$as_echo "$at_srcdir/ofproto-dpif.at:5771: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5771"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5772"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5771"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145017,15 +145500,15 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5774: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5774"
+$as_echo "$at_srcdir/ofproto-dpif.at:5773: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5773"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5774"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5773"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145033,7 +145516,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5776: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5775: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -145043,7 +145526,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5776"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5775"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -145054,59 +145537,59 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "recirc_id=0,icmp,in_port=1,nw_frag=no,icmp_type=0x8/0xff, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5776"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5775"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5779: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5779"
+$as_echo "$at_srcdir/ofproto-dpif.at:5778: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5778"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5779"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5778"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5779: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5779"
+$as_echo "$at_srcdir/ofproto-dpif.at:5778: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5778"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5779"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5778"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5779: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5779"
+$as_echo "$at_srcdir/ofproto-dpif.at:5778: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5778"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5779"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5778"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145116,13 +145599,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_888
-#AT_START_889
-at_fn_group_banner 889 'ofproto-dpif.at:5782' \
+#AT_STOP_890
+#AT_START_891
+at_fn_group_banner 891 'ofproto-dpif.at:5781' \
   "ofproto-dpif megaflow - normal" "                 " 53
 at_xfail=no
 (
-  $as_echo "889. $at_setup_line: testing $at_desc ..."
+  $as_echo "891. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -145132,29 +145615,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5783: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5783"
+$as_echo "$at_srcdir/ofproto-dpif.at:5782: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5782"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5783"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5782"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5783: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5783"
+$as_echo "$at_srcdir/ofproto-dpif.at:5782: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5782"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5783"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5782"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -145164,49 +145647,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5783: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5782: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5783"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5782"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5783"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5782"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5783: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5783"
+$as_echo "$at_srcdir/ofproto-dpif.at:5782: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5782"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5783"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5782"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5783: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5783"
+$as_echo "$at_srcdir/ofproto-dpif.at:5782: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5782"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5783"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5782"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -145218,14 +145701,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5783: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5782: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5783"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5782"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -145233,12 +145716,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5783"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5782"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145247,15 +145730,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5783: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5783"
+$as_echo "$at_srcdir/ofproto-dpif.at:5782: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5782"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5783"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5782"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145263,15 +145746,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5784: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5784"
+$as_echo "$at_srcdir/ofproto-dpif.at:5783: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5783"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5784"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5783"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145281,45 +145764,45 @@
     -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
     -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5786: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "ofproto-dpif.at:5786"
+$as_echo "$at_srcdir/ofproto-dpif.at:5785: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "ofproto-dpif.at:5785"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5786"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5785"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5787: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5787"
+$as_echo "$at_srcdir/ofproto-dpif.at:5786: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5786"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5787"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5786"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5788: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5788"
+$as_echo "$at_srcdir/ofproto-dpif.at:5787: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5787"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5788"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5787"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145327,7 +145810,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5790: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5789: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -145337,7 +145820,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5790"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5789"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -145348,7 +145831,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -145356,52 +145839,52 @@
 recirc_id=0,ip,in_port=1,vlan_tci=0x0000/0x1fff,dl_src=50:54:00:00:00:0b,dl_dst=50:54:00:00:00:0c,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5790"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5789"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5794: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5794"
+$as_echo "$at_srcdir/ofproto-dpif.at:5793: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5793"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5794"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5793"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5794: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5794"
+$as_echo "$at_srcdir/ofproto-dpif.at:5793: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5793"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5794"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5793"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5794: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5794"
+$as_echo "$at_srcdir/ofproto-dpif.at:5793: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5793"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5794"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5793"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145411,13 +145894,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_889
-#AT_START_890
-at_fn_group_banner 890 'ofproto-dpif.at:5797' \
+#AT_STOP_891
+#AT_START_892
+at_fn_group_banner 892 'ofproto-dpif.at:5796' \
   "ofproto-dpif megaflow - mpls" "                   " 53
 at_xfail=no
 (
-  $as_echo "890. $at_setup_line: testing $at_desc ..."
+  $as_echo "892. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -145427,29 +145910,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5798: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5798"
+$as_echo "$at_srcdir/ofproto-dpif.at:5797: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5797"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5798"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5797"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5798: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5798"
+$as_echo "$at_srcdir/ofproto-dpif.at:5797: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5797"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5798"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5797"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -145459,49 +145942,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5798: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5797: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5798"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5797"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5798"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5797"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5798: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5798"
+$as_echo "$at_srcdir/ofproto-dpif.at:5797: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5797"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5798"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5798: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5798"
+$as_echo "$at_srcdir/ofproto-dpif.at:5797: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5797"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5798"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -145513,14 +145996,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5798: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5797: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5798"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5797"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -145528,12 +146011,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5798"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145542,15 +146025,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5798: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5798"
+$as_echo "$at_srcdir/ofproto-dpif.at:5797: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5797"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5798"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145558,15 +146041,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5799: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5799"
+$as_echo "$at_srcdir/ofproto-dpif.at:5798: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5798"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5799"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5798"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145581,45 +146064,45 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5805: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:5805"
+$as_echo "$at_srcdir/ofproto-dpif.at:5804: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:5804"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5805"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5804"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5806: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x8847),mpls(label=11,tc=3,ttl=64,bos=1)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5806"
+$as_echo "$at_srcdir/ofproto-dpif.at:5805: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x8847),mpls(label=11,tc=3,ttl=64,bos=1)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5805"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x8847),mpls(label=11,tc=3,ttl=64,bos=1)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5806"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5805"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5807: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0a),eth_type(0x8847),mpls(label=11,tc=3,ttl=64,bos=1)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5807"
+$as_echo "$at_srcdir/ofproto-dpif.at:5806: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0a),eth_type(0x8847),mpls(label=11,tc=3,ttl=64,bos=1)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5806"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0a),eth_type(0x8847),mpls(label=11,tc=3,ttl=64,bos=1)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5807"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5806"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145627,7 +146110,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5809: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5808: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -145637,7 +146120,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5809"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5808"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -145648,7 +146131,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -145656,52 +146139,52 @@
 recirc_id=0,mpls,in_port=1,dl_src=50:54:00:00:00:0b,mpls_bos=1, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5809"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5808"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5813: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5813"
+$as_echo "$at_srcdir/ofproto-dpif.at:5812: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5812"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5813"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5812"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5813: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5813"
+$as_echo "$at_srcdir/ofproto-dpif.at:5812: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5812"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5813"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5812"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5813: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5813"
+$as_echo "$at_srcdir/ofproto-dpif.at:5812: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5812"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5813"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5812"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145711,13 +146194,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_890
-#AT_START_891
-at_fn_group_banner 891 'ofproto-dpif.at:5846' \
+#AT_STOP_892
+#AT_START_893
+at_fn_group_banner 893 'ofproto-dpif.at:5845' \
   "ofproto-dpif megaflow - netflow - IPv4 collector" "" 53
 at_xfail=no
 (
-  $as_echo "891. $at_setup_line: testing $at_desc ..."
+  $as_echo "893. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -145727,29 +146210,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5845"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5845"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -145759,49 +146242,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5846"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5845"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5845"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5845"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -145813,14 +146296,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5846"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5845"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -145828,12 +146311,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145842,15 +146325,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5845"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145858,15 +146341,15 @@
 
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5845"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145882,15 +146365,15 @@
 mv __cleanup cleanup
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > netflow.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > netflow.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:5845"
 ( $at_check_trace; ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > netflow.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -145904,15 +146387,15 @@
        engine_id=1 engine_type=2 active_timeout=30 add-id-to-interface=false
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "ofproto-dpif.at:5845"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -145920,15 +146403,15 @@
 $at_traceon; }
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5845"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -145936,15 +146419,15 @@
 $at_traceon; }
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5845"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -145953,7 +146436,7 @@
 
   sleep 1
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -145963,7 +146446,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5846"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5845"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -145974,7 +146457,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -145982,7 +146465,7 @@
 recirc_id=0,icmp,in_port=1,vlan_tci=0x0000/0x1fff,dl_src=50:54:00:00:00:0b,dl_dst=50:54:00:00:00:0c,nw_src=10.0.0.4,nw_dst=10.0.0.3,nw_tos=0,nw_frag=no,icmp_type=0x8/0xff,icmp_code=0x0/0xff, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -145990,15 +146473,15 @@
 $at_traceon; }
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5845"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -146006,15 +146489,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5845"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -146022,15 +146505,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5846"
+$as_echo "$at_srcdir/ofproto-dpif.at:5845: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5845"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -146041,13 +146524,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_891
-#AT_START_892
-at_fn_group_banner 892 'ofproto-dpif.at:5847' \
+#AT_STOP_893
+#AT_START_894
+at_fn_group_banner 894 'ofproto-dpif.at:5846' \
   "ofproto-dpif megaflow - netflow - IPv6 collector" "" 53
 at_xfail=no
 (
-  $as_echo "892. $at_setup_line: testing $at_desc ..."
+  $as_echo "894. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -146057,29 +146540,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5846"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5846"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -146089,49 +146572,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5847"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5846"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5846"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5846"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -146143,14 +146626,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5847"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5846"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -146158,12 +146641,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146172,15 +146655,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5846"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146188,15 +146671,15 @@
 
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5846"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146212,15 +146695,15 @@
 mv __cleanup cleanup
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:[::1] > netflow.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:[::1] > netflow.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:5846"
 ( $at_check_trace; ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:[::1] > netflow.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146234,15 +146717,15 @@
        engine_id=1 engine_type=2 active_timeout=30 add-id-to-interface=false
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "ofproto-dpif.at:5846"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -146250,15 +146733,15 @@
 $at_traceon; }
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5846"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -146266,15 +146749,15 @@
 $at_traceon; }
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5846"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -146283,7 +146766,7 @@
 
   sleep 1
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -146293,7 +146776,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5847"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5846"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -146304,7 +146787,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -146312,7 +146795,7 @@
 recirc_id=0,icmp,in_port=1,vlan_tci=0x0000/0x1fff,dl_src=50:54:00:00:00:0b,dl_dst=50:54:00:00:00:0c,nw_src=10.0.0.4,nw_dst=10.0.0.3,nw_tos=0,nw_frag=no,icmp_type=0x8/0xff,icmp_code=0x0/0xff, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -146320,15 +146803,15 @@
 $at_traceon; }
 
   { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5846"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -146336,15 +146819,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5846"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -146352,15 +146835,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5847: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5847"
+$as_echo "$at_srcdir/ofproto-dpif.at:5846: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5846"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -146371,13 +146854,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_892
-#AT_START_893
-at_fn_group_banner 893 'ofproto-dpif.at:5849' \
+#AT_STOP_894
+#AT_START_895
+at_fn_group_banner 895 'ofproto-dpif.at:5848' \
   "ofproto-dpif megaflow - normal, active-backup bonding" "" 53
 at_xfail=no
 (
-  $as_echo "893. $at_setup_line: testing $at_desc ..."
+  $as_echo "895. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -146387,29 +146870,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5850: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5850"
+$as_echo "$at_srcdir/ofproto-dpif.at:5849: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5849"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5850"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5849"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5850: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5850"
+$as_echo "$at_srcdir/ofproto-dpif.at:5849: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5849"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5850"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5849"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -146419,49 +146902,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5850: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5849: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5850"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5849"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5850"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5849"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5850: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5850"
+$as_echo "$at_srcdir/ofproto-dpif.at:5849: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5849"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5850"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5849"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5850: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5850"
+$as_echo "$at_srcdir/ofproto-dpif.at:5849: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5849"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5850"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5849"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -146473,14 +146956,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5850: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5849: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5850"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5849"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -146488,12 +146971,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5850"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5849"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146502,21 +146985,21 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5850: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 -- \\
+$as_echo "$at_srcdir/ofproto-dpif.at:5849: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 -- \\
    add-bond br0 bond0 p2 p3 bond_mode=active-backup -- \\
    set interface p2 type=dummy ofport_request=2 -- \\
    set interface p3 type=dummy ofport_request=3 "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5850"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5849"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 -- \
    add-bond br0 bond0 p2 p3 bond_mode=active-backup -- \
    set interface p2 type=dummy ofport_request=2 -- \
    set interface p3 type=dummy ofport_request=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5850"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5849"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146524,32 +147007,32 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5855: ovs-appctl netdev-dummy/set-admin-state up"
-at_fn_check_prepare_trace "ofproto-dpif.at:5855"
+$as_echo "$at_srcdir/ofproto-dpif.at:5854: ovs-appctl netdev-dummy/set-admin-state up"
+at_fn_check_prepare_trace "ofproto-dpif.at:5854"
 ( $at_check_trace; ovs-appctl netdev-dummy/set-admin-state up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OK
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5855"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5854"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5857: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5857"
+$as_echo "$at_srcdir/ofproto-dpif.at:5856: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5856"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5857"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5856"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146557,45 +147040,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5859: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "ofproto-dpif.at:5859"
+$as_echo "$at_srcdir/ofproto-dpif.at:5858: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "ofproto-dpif.at:5858"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5859"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5858"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5860: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5860"
+$as_echo "$at_srcdir/ofproto-dpif.at:5859: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5859"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5860"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5859"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5861: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5861"
+$as_echo "$at_srcdir/ofproto-dpif.at:5860: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5860"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5861"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5860"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146603,7 +147086,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5863: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5862: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -146613,7 +147096,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5863"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5862"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -146624,7 +147107,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -146632,52 +147115,52 @@
 recirc_id=0,ip,in_port=1,vlan_tci=0x0000/0x1fff,dl_src=50:54:00:00:00:0b,dl_dst=50:54:00:00:00:0c,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5863"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5862"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5867: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5867"
+$as_echo "$at_srcdir/ofproto-dpif.at:5866: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5866"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5867"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5866"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5867: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5867"
+$as_echo "$at_srcdir/ofproto-dpif.at:5866: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5866"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5867"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5866"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5867: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5867"
+$as_echo "$at_srcdir/ofproto-dpif.at:5866: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5866"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5867"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5866"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146687,13 +147170,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_893
-#AT_START_894
-at_fn_group_banner 894 'ofproto-dpif.at:5870' \
+#AT_STOP_895
+#AT_START_896
+at_fn_group_banner 896 'ofproto-dpif.at:5869' \
   "ofproto-dpif megaflow - normal, balance-slb bonding" "" 53
 at_xfail=no
 (
-  $as_echo "894. $at_setup_line: testing $at_desc ..."
+  $as_echo "896. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -146703,29 +147186,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5871: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5871"
+$as_echo "$at_srcdir/ofproto-dpif.at:5870: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5870"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5871"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5870"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5871: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5871"
+$as_echo "$at_srcdir/ofproto-dpif.at:5870: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5870"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5871"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5870"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -146735,49 +147218,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5871: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5870: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5871"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5870"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5871"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5870"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5871: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5871"
+$as_echo "$at_srcdir/ofproto-dpif.at:5870: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5870"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5871"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5870"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5871: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5871"
+$as_echo "$at_srcdir/ofproto-dpif.at:5870: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5870"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5871"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5870"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -146789,14 +147272,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5871: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5870: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5871"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5870"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -146804,12 +147287,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5871"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5870"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146818,21 +147301,21 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5871: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 -- \\
+$as_echo "$at_srcdir/ofproto-dpif.at:5870: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 -- \\
    add-bond br0 bond0 p2 p3 bond_mode=balance-slb -- \\
    set interface p2 type=dummy ofport_request=2 -- \\
    set interface p3 type=dummy ofport_request=3 "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5871"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5870"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 -- \
    add-bond br0 bond0 p2 p3 bond_mode=balance-slb -- \
    set interface p2 type=dummy ofport_request=2 -- \
    set interface p3 type=dummy ofport_request=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5871"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5870"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146840,32 +147323,32 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5876: ovs-appctl netdev-dummy/set-admin-state up"
-at_fn_check_prepare_trace "ofproto-dpif.at:5876"
+$as_echo "$at_srcdir/ofproto-dpif.at:5875: ovs-appctl netdev-dummy/set-admin-state up"
+at_fn_check_prepare_trace "ofproto-dpif.at:5875"
 ( $at_check_trace; ovs-appctl netdev-dummy/set-admin-state up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OK
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5876"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5875"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5878: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5878"
+$as_echo "$at_srcdir/ofproto-dpif.at:5877: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5877"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5878"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5877"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146873,45 +147356,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5880: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "ofproto-dpif.at:5880"
+$as_echo "$at_srcdir/ofproto-dpif.at:5879: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "ofproto-dpif.at:5879"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5880"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5879"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5881: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5881"
+$as_echo "$at_srcdir/ofproto-dpif.at:5880: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5880"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5881"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5880"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5882: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5882"
+$as_echo "$at_srcdir/ofproto-dpif.at:5881: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5881"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5882"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5881"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -146919,7 +147402,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5884: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5883: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -146929,7 +147412,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5884"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5883"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -146940,7 +147423,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -146948,52 +147431,52 @@
 recirc_id=0,ip,in_port=1,vlan_tci=0x0000/0x1fff,dl_src=50:54:00:00:00:0b,dl_dst=50:54:00:00:00:0c,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5884"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5883"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5888: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5888"
+$as_echo "$at_srcdir/ofproto-dpif.at:5887: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5887"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5888"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5887"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5888: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5888"
+$as_echo "$at_srcdir/ofproto-dpif.at:5887: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5887"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5888"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5887"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5888: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5888"
+$as_echo "$at_srcdir/ofproto-dpif.at:5887: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5887"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5888"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5887"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147003,13 +147486,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_894
-#AT_START_895
-at_fn_group_banner 895 'ofproto-dpif.at:5891' \
+#AT_STOP_896
+#AT_START_897
+at_fn_group_banner 897 'ofproto-dpif.at:5890' \
   "ofproto-dpif megaflow - normal, balance-tcp bonding" "" 53
 at_xfail=no
 (
-  $as_echo "895. $at_setup_line: testing $at_desc ..."
+  $as_echo "897. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # Create bond0 on br0 with interfaces p0 and p1
@@ -147022,29 +147505,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5895: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5895"
+$as_echo "$at_srcdir/ofproto-dpif.at:5894: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5894"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5895"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5894"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5895: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5895"
+$as_echo "$at_srcdir/ofproto-dpif.at:5894: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5894"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5895"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5894"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -147054,49 +147537,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5895: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5894: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5895"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5894"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5895"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5894"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5895: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5895"
+$as_echo "$at_srcdir/ofproto-dpif.at:5894: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5894"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5895"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5894"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5895: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5895"
+$as_echo "$at_srcdir/ofproto-dpif.at:5894: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5894"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5895"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5894"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -147108,14 +147591,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5895: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5894: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5895"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5894"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -147123,12 +147606,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5895"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5894"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147137,7 +147620,7 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5895: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-bond br0 bond0 p0 p1 bond_mode=balance-tcp lacp=active \\
+$as_echo "$at_srcdir/ofproto-dpif.at:5894: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-bond br0 bond0 p0 p1 bond_mode=balance-tcp lacp=active \\
                             other-config:lacp-time=fast \\
                             other-config:bond-rebalance-interval=0 -- \\
    set interface p0 type=patch options:peer=p2 ofport_request=1 -- \\
@@ -147151,7 +147634,7 @@
                             other-config:bond-rebalance-interval=0 -- \\
    set interface p2 type=patch options:peer=p0 ofport_request=3 -- \\
    set interface p3 type=patch options:peer=p1 ofport_request=4 -- "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5895"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5894"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-bond br0 bond0 p0 p1 bond_mode=balance-tcp lacp=active \
                             other-config:lacp-time=fast \
                             other-config:bond-rebalance-interval=0 -- \
@@ -147166,12 +147649,12 @@
                             other-config:bond-rebalance-interval=0 -- \
    set interface p2 type=patch options:peer=p0 ofport_request=3 -- \
    set interface p3 type=patch options:peer=p1 ofport_request=4 --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5895"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5894"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147180,32 +147663,32 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5911: ovs-appctl netdev-dummy/set-admin-state up"
-at_fn_check_prepare_trace "ofproto-dpif.at:5911"
+$as_echo "$at_srcdir/ofproto-dpif.at:5910: ovs-appctl netdev-dummy/set-admin-state up"
+at_fn_check_prepare_trace "ofproto-dpif.at:5910"
 ( $at_check_trace; ovs-appctl netdev-dummy/set-admin-state up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "OK
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5911"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5910"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5913: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5913"
+$as_echo "$at_srcdir/ofproto-dpif.at:5912: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5912"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5912"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147214,30 +147697,30 @@
 ovs-vsctl  \
     -- add-port br0 p7 -- set Interface p7 type=dummy ofport_request=7
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5915: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "ofproto-dpif.at:5915"
+$as_echo "$at_srcdir/ofproto-dpif.at:5914: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "ofproto-dpif.at:5914"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5915"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5914"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5916: ovs-ofctl add-flow br1 action=normal"
-at_fn_check_prepare_trace "ofproto-dpif.at:5916"
+$as_echo "$at_srcdir/ofproto-dpif.at:5915: ovs-ofctl add-flow br1 action=normal"
+at_fn_check_prepare_trace "ofproto-dpif.at:5915"
 ( $at_check_trace; ovs-ofctl add-flow br1 action=normal
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5916"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5915"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147246,30 +147729,30 @@
 ovs-appctl time/stop
 ovs-appctl time/warp 5000
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5919: ovs-appctl netdev-dummy/receive p7 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5919"
+$as_echo "$at_srcdir/ofproto-dpif.at:5918: ovs-appctl netdev-dummy/receive p7 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5918"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p7 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5919"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5918"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5920: ovs-appctl netdev-dummy/receive p7 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5920"
+$as_echo "$at_srcdir/ofproto-dpif.at:5919: ovs-appctl netdev-dummy/receive p7 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5919"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p7 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5920"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5919"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147277,7 +147760,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5922: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5921: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -147287,7 +147770,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5922"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5921"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -147298,7 +147781,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -147306,52 +147789,52 @@
 recirc_id=0,ip,in_port=7,vlan_tci=0x0000/0x1fff,dl_src=50:54:00:00:00:0b,dl_dst=50:54:00:00:00:0c,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5922"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5921"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5926: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5926"
+$as_echo "$at_srcdir/ofproto-dpif.at:5925: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5925"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5926"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5925"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5926: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5926"
+$as_echo "$at_srcdir/ofproto-dpif.at:5925: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5925"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5926"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5925"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5926: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5926"
+$as_echo "$at_srcdir/ofproto-dpif.at:5925: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5925"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5926"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5925"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147361,13 +147844,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_895
-#AT_START_896
-at_fn_group_banner 896 'ofproto-dpif.at:5929' \
+#AT_STOP_897
+#AT_START_898
+at_fn_group_banner 898 'ofproto-dpif.at:5928' \
   "ofproto-dpif megaflow - resubmit port action" "   " 53
 at_xfail=no
 (
-  $as_echo "896. $at_setup_line: testing $at_desc ..."
+  $as_echo "898. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -147377,29 +147860,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5930: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5930"
+$as_echo "$at_srcdir/ofproto-dpif.at:5929: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5929"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5930"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5929"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5930: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5930"
+$as_echo "$at_srcdir/ofproto-dpif.at:5929: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5929"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5930"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5929"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -147409,49 +147892,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5930: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5929: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5930"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5929"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5930"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5929"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5930: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5930"
+$as_echo "$at_srcdir/ofproto-dpif.at:5929: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5929"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5930"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5929"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5930: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5930"
+$as_echo "$at_srcdir/ofproto-dpif.at:5929: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5929"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5930"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5929"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -147463,14 +147946,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5930: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5929: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5930"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5929"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -147478,12 +147961,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5930"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5929"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147492,15 +147975,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5930: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5930"
+$as_echo "$at_srcdir/ofproto-dpif.at:5929: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5929"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5930"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5929"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147508,15 +147991,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5931: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5931"
+$as_echo "$at_srcdir/ofproto-dpif.at:5930: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5930"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5931"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5930"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147531,45 +148014,45 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5937: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:5937"
+$as_echo "$at_srcdir/ofproto-dpif.at:5936: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:5936"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5937"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5936"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5938: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5938"
+$as_echo "$at_srcdir/ofproto-dpif.at:5937: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5937"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5938"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5937"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5939: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5939"
+$as_echo "$at_srcdir/ofproto-dpif.at:5938: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5938"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147577,7 +148060,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5941: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5940: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -147587,7 +148070,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5940"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -147598,7 +148081,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -147606,52 +148089,52 @@
 recirc_id=0,ip,in_port=1,dl_src=50:54:00:00:00:0b/ff:ff:00:00:00:02,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5940"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5945: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5945"
+$as_echo "$at_srcdir/ofproto-dpif.at:5944: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5944"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5945"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5944"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5945: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5945"
+$as_echo "$at_srcdir/ofproto-dpif.at:5944: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5944"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5945"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5944"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5945: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5945"
+$as_echo "$at_srcdir/ofproto-dpif.at:5944: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5944"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5945"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5944"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147661,13 +148144,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_896
-#AT_START_897
-at_fn_group_banner 897 'ofproto-dpif.at:5948' \
+#AT_STOP_898
+#AT_START_899
+at_fn_group_banner 899 'ofproto-dpif.at:5947' \
   "ofproto-dpif megaflow - resubmit table action" "  " 53
 at_xfail=no
 (
-  $as_echo "897. $at_setup_line: testing $at_desc ..."
+  $as_echo "899. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -147677,29 +148160,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5949: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5949"
+$as_echo "$at_srcdir/ofproto-dpif.at:5948: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5948"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5948"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5949: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5949"
+$as_echo "$at_srcdir/ofproto-dpif.at:5948: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5948"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5948"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -147709,49 +148192,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5949: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5948: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5949"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5948"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5948"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5949: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5949"
+$as_echo "$at_srcdir/ofproto-dpif.at:5948: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5948"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5948"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5949: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5949"
+$as_echo "$at_srcdir/ofproto-dpif.at:5948: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5948"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5948"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -147763,14 +148246,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5949: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5948: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5949"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5948"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -147778,12 +148261,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5948"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147792,15 +148275,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5949: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5949"
+$as_echo "$at_srcdir/ofproto-dpif.at:5948: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5948"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5949"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5948"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147808,15 +148291,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5950: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5950"
+$as_echo "$at_srcdir/ofproto-dpif.at:5949: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5949"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5950"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5949"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147831,47 +148314,47 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5956: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:5956"
+$as_echo "$at_srcdir/ofproto-dpif.at:5955: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:5955"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5956"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5955"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5957: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5957"
+$as_echo "$at_srcdir/ofproto-dpif.at:5956: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5956"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5957"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5956"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5958: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=
+$as_echo "$at_srcdir/ofproto-dpif.at:5957: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=
 1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5958"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5957"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=
 1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5958"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147879,7 +148362,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5961: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5960: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -147889,7 +148372,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5961"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5960"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -147900,7 +148383,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -147908,52 +148391,52 @@
 recirc_id=0,ip,in_port=1,dl_src=50:54:00:00:00:0b,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5961"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5960"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5965: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5965"
+$as_echo "$at_srcdir/ofproto-dpif.at:5964: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5964"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5965"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5964"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5965: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5965"
+$as_echo "$at_srcdir/ofproto-dpif.at:5964: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5964"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5965"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5964"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5965: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5965"
+$as_echo "$at_srcdir/ofproto-dpif.at:5964: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5964"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5965"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5964"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -147963,13 +148446,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_897
-#AT_START_898
-at_fn_group_banner 898 'ofproto-dpif.at:5968' \
+#AT_STOP_899
+#AT_START_900
+at_fn_group_banner 900 'ofproto-dpif.at:5967' \
   "ofproto-dpif megaflow - goto_table action" "      " 53
 at_xfail=no
 (
-  $as_echo "898. $at_setup_line: testing $at_desc ..."
+  $as_echo "900. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -147979,29 +148462,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5969: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5969"
+$as_echo "$at_srcdir/ofproto-dpif.at:5968: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5968"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5968"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5969: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5969"
+$as_echo "$at_srcdir/ofproto-dpif.at:5968: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5968"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5968"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -148011,49 +148494,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5969: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5968: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5969"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5968"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5968"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5969: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5969"
+$as_echo "$at_srcdir/ofproto-dpif.at:5968: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5968"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5968"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5969: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5969"
+$as_echo "$at_srcdir/ofproto-dpif.at:5968: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5968"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5968"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -148065,14 +148548,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5969: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5968: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5969"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5968"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -148080,12 +148563,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5968"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148094,15 +148577,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5969: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5969"
+$as_echo "$at_srcdir/ofproto-dpif.at:5968: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5968"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5968"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148110,15 +148593,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5970: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5970"
+$as_echo "$at_srcdir/ofproto-dpif.at:5969: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5969"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5970"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5969"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148133,45 +148616,45 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5976: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:5976"
+$as_echo "$at_srcdir/ofproto-dpif.at:5975: ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:5975"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5976"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5975"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5977: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5977"
+$as_echo "$at_srcdir/ofproto-dpif.at:5976: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5976"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5977"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5976"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5978: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:5978"
+$as_echo "$at_srcdir/ofproto-dpif.at:5977: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5977"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5978"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5977"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148179,7 +148662,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5980: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:5979: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -148189,7 +148672,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5980"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5979"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -148200,7 +148683,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -148208,52 +148691,52 @@
 recirc_id=0,ip,in_port=1,dl_src=50:54:00:00:00:0b,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5980"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5979"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5984: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:5984"
+$as_echo "$at_srcdir/ofproto-dpif.at:5983: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:5983"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5984"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5984: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5984"
+$as_echo "$at_srcdir/ofproto-dpif.at:5983: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5983"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5984"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5984: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:5984"
+$as_echo "$at_srcdir/ofproto-dpif.at:5983: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:5983"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5984"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148263,13 +148746,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_898
-#AT_START_899
-at_fn_group_banner 899 'ofproto-dpif.at:5987' \
+#AT_STOP_900
+#AT_START_901
+at_fn_group_banner 901 'ofproto-dpif.at:5986' \
   "ofproto-dpif megaflow - mirroring, select_all" "  " 53
 at_xfail=no
 (
-  $as_echo "899. $at_setup_line: testing $at_desc ..."
+  $as_echo "901. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -148279,29 +148762,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5988: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5988"
+$as_echo "$at_srcdir/ofproto-dpif.at:5987: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:5987"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5987"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5988: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5988"
+$as_echo "$at_srcdir/ofproto-dpif.at:5987: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:5987"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5987"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -148311,49 +148794,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5988: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5987: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5988"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5987"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5987"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5988: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:5988"
+$as_echo "$at_srcdir/ofproto-dpif.at:5987: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:5987"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5987"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5988: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:5988"
+$as_echo "$at_srcdir/ofproto-dpif.at:5987: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:5987"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5987"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -148365,14 +148848,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5988: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:5987: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5988"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:5987"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -148380,12 +148863,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5987"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148394,15 +148877,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5988: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:5988"
+$as_echo "$at_srcdir/ofproto-dpif.at:5987: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:5987"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5988"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5987"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148410,15 +148893,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5989: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:5989"
+$as_echo "$at_srcdir/ofproto-dpif.at:5988: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:5988"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5989"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5988"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148438,30 +148921,30 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:5999: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:5999"
+$as_echo "$at_srcdir/ofproto-dpif.at:5998: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:5998"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5999"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5998"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6000: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6000"
+$as_echo "$at_srcdir/ofproto-dpif.at:5999: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:5999"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6000"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:5999"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148469,15 +148952,15 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6002: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6002"
+$as_echo "$at_srcdir/ofproto-dpif.at:6001: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6001"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6002"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6001"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148485,7 +148968,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6004: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:6003: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -148495,7 +148978,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6004"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6003"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -148506,59 +148989,59 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "recirc_id=0,ip,in_port=1,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6004"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6003"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6007: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6007"
+$as_echo "$at_srcdir/ofproto-dpif.at:6006: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6006"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6007"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6006"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6007: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6007"
+$as_echo "$at_srcdir/ofproto-dpif.at:6006: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6006"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6007"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6006"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6007: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6007"
+$as_echo "$at_srcdir/ofproto-dpif.at:6006: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6006"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6007"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6006"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148568,13 +149051,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_899
-#AT_START_900
-at_fn_group_banner 900 'ofproto-dpif.at:6010' \
+#AT_STOP_901
+#AT_START_902
+at_fn_group_banner 902 'ofproto-dpif.at:6009' \
   "ofproto-dpif megaflow - mirroring, select_vlan" " " 53
 at_xfail=no
 (
-  $as_echo "900. $at_setup_line: testing $at_desc ..."
+  $as_echo "902. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -148584,29 +149067,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6011: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6011"
+$as_echo "$at_srcdir/ofproto-dpif.at:6010: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6010"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6011"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6010"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6011: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6011"
+$as_echo "$at_srcdir/ofproto-dpif.at:6010: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6010"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6011"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6010"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -148616,49 +149099,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6011: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6010: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6011"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6010"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6011"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6010"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6011: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6011"
+$as_echo "$at_srcdir/ofproto-dpif.at:6010: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6010"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6011"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6010"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6011: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6011"
+$as_echo "$at_srcdir/ofproto-dpif.at:6010: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6010"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6011"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6010"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -148670,14 +149153,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6011: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6010: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6011"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6010"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -148685,12 +149168,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6011"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6010"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148699,15 +149182,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6011: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6011"
+$as_echo "$at_srcdir/ofproto-dpif.at:6010: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6010"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6011"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6010"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148715,15 +149198,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6012: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:6012"
+$as_echo "$at_srcdir/ofproto-dpif.at:6011: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:6011"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6012"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6011"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148743,45 +149226,45 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6022: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:6022"
+$as_echo "$at_srcdir/ofproto-dpif.at:6021: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:6021"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6022"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6021"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6023: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x8100),vlan(vid=11,pcp=7),encap(eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0))'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6023"
+$as_echo "$at_srcdir/ofproto-dpif.at:6022: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x8100),vlan(vid=11,pcp=7),encap(eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0))'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6022"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x8100),vlan(vid=11,pcp=7),encap(eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0))'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6023"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6022"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6024: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6024"
+$as_echo "$at_srcdir/ofproto-dpif.at:6023: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6023"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6024"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6023"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148789,7 +149272,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6026: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:6025: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -148799,7 +149282,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6026"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6025"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -148810,7 +149293,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -148818,52 +149301,52 @@
 recirc_id=0,ip,in_port=1,vlan_tci=0x0000/0x1fff,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6026"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6030: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6030"
+$as_echo "$at_srcdir/ofproto-dpif.at:6029: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6029"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6029"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6030: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6030"
+$as_echo "$at_srcdir/ofproto-dpif.at:6029: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6029"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6029"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6030: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6030"
+$as_echo "$at_srcdir/ofproto-dpif.at:6029: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6029"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6029"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -148873,13 +149356,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_900
-#AT_START_901
-at_fn_group_banner 901 'ofproto-dpif.at:6033' \
+#AT_STOP_902
+#AT_START_903
+at_fn_group_banner 903 'ofproto-dpif.at:6032' \
   "ofproto-dpif megaflow - move action" "            " 53
 at_xfail=no
 (
-  $as_echo "901. $at_setup_line: testing $at_desc ..."
+  $as_echo "903. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -148889,29 +149372,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6034: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6034"
+$as_echo "$at_srcdir/ofproto-dpif.at:6033: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6033"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6034"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6033"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6034: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6034"
+$as_echo "$at_srcdir/ofproto-dpif.at:6033: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6033"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6034"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6033"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -148921,49 +149404,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6034: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6033: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6034"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6033"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6034"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6033"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6034: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6034"
+$as_echo "$at_srcdir/ofproto-dpif.at:6033: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6033"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6034"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6033"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6034: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6034"
+$as_echo "$at_srcdir/ofproto-dpif.at:6033: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6033"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6034"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6033"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -148975,14 +149458,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6034: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6033: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6034"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6033"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -148990,12 +149473,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6034"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6033"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149004,15 +149487,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6034: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6034"
+$as_echo "$at_srcdir/ofproto-dpif.at:6033: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6033"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6034"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6033"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149020,15 +149503,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6035: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:6035"
+$as_echo "$at_srcdir/ofproto-dpif.at:6034: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:6034"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6035"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6034"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149044,45 +149527,45 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6042: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:6042"
+$as_echo "$at_srcdir/ofproto-dpif.at:6041: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:6041"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6042"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6043: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6043"
+$as_echo "$at_srcdir/ofproto-dpif.at:6042: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6042"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6043"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6044: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6044"
+$as_echo "$at_srcdir/ofproto-dpif.at:6043: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6043"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6044"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6043"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149090,7 +149573,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6046: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:6045: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -149100,7 +149583,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6046"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6045"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -149111,7 +149594,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -149119,52 +149602,52 @@
 recirc_id=0,ip,in_port=1,nw_src=10.0.0.4,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6046"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6045"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6050: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6050"
+$as_echo "$at_srcdir/ofproto-dpif.at:6049: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6049"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6050"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6049"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6050: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6050"
+$as_echo "$at_srcdir/ofproto-dpif.at:6049: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6049"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6050"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6049"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6050: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6050"
+$as_echo "$at_srcdir/ofproto-dpif.at:6049: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6049"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6050"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6049"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149174,13 +149657,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_901
-#AT_START_902
-at_fn_group_banner 902 'ofproto-dpif.at:6053' \
+#AT_STOP_903
+#AT_START_904
+at_fn_group_banner 904 'ofproto-dpif.at:6052' \
   "ofproto-dpif megaflow - push action" "            " 53
 at_xfail=no
 (
-  $as_echo "902. $at_setup_line: testing $at_desc ..."
+  $as_echo "904. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -149190,29 +149673,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6054: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6054"
+$as_echo "$at_srcdir/ofproto-dpif.at:6053: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6053"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6053"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6054: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6054"
+$as_echo "$at_srcdir/ofproto-dpif.at:6053: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6053"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6053"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -149222,49 +149705,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6054: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6053: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6053"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6053"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6054: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6054"
+$as_echo "$at_srcdir/ofproto-dpif.at:6053: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6053"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6053"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6054: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6054"
+$as_echo "$at_srcdir/ofproto-dpif.at:6053: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6053"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6053"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -149276,14 +149759,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6054: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6053: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6053"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -149291,12 +149774,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6053"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149305,15 +149788,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6054: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6054"
+$as_echo "$at_srcdir/ofproto-dpif.at:6053: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6053"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6053"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149321,15 +149804,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6055: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:6055"
+$as_echo "$at_srcdir/ofproto-dpif.at:6054: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:6054"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6054"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149343,45 +149826,45 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6060: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:6060"
+$as_echo "$at_srcdir/ofproto-dpif.at:6059: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:6059"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6060"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6059"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6061: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6061"
+$as_echo "$at_srcdir/ofproto-dpif.at:6060: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6060"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6061"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6060"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6062: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6062"
+$as_echo "$at_srcdir/ofproto-dpif.at:6061: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6061"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6062"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6061"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149389,7 +149872,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6064: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:6063: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -149399,7 +149882,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6064"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6063"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -149410,7 +149893,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -149418,52 +149901,52 @@
 recirc_id=0,ip,in_port=1,nw_src=10.0.0.4,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6064"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6063"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6068: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6068"
+$as_echo "$at_srcdir/ofproto-dpif.at:6067: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6067"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6068"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6067"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6068: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6068"
+$as_echo "$at_srcdir/ofproto-dpif.at:6067: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6067"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6068"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6067"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6068: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6068"
+$as_echo "$at_srcdir/ofproto-dpif.at:6067: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6067"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6068"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6067"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149473,13 +149956,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_902
-#AT_START_903
-at_fn_group_banner 903 'ofproto-dpif.at:6071' \
+#AT_STOP_904
+#AT_START_905
+at_fn_group_banner 905 'ofproto-dpif.at:6070' \
   "ofproto-dpif megaflow - learning" "               " 53
 at_xfail=no
 (
-  $as_echo "903. $at_setup_line: testing $at_desc ..."
+  $as_echo "905. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -149489,29 +149972,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6072: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6072"
+$as_echo "$at_srcdir/ofproto-dpif.at:6071: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6071"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6072"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6071"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6072: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6072"
+$as_echo "$at_srcdir/ofproto-dpif.at:6071: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6071"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6072"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6071"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -149521,49 +150004,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6072: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6071: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6072"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6071"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6072"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6071"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6072: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6072"
+$as_echo "$at_srcdir/ofproto-dpif.at:6071: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6071"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6072"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6071"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6072: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6072"
+$as_echo "$at_srcdir/ofproto-dpif.at:6071: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6071"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6072"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6071"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -149575,14 +150058,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6072: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6071: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6072"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6071"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -149590,12 +150073,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6072"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6071"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149604,15 +150087,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6072: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6072"
+$as_echo "$at_srcdir/ofproto-dpif.at:6071: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6071"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6072"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6071"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149620,15 +150103,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6073: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:6073"
+$as_echo "$at_srcdir/ofproto-dpif.at:6072: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:6072"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6073"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6072"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149642,15 +150125,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6078: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:6078"
+$as_echo "$at_srcdir/ofproto-dpif.at:6077: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:6077"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6078"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6077"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149663,30 +150146,30 @@
 # the second iteration, allowing the flows to be installed.
 for i in 1 2; do
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6085: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6085"
+$as_echo "$at_srcdir/ofproto-dpif.at:6084: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6084"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6085"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6084"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6086: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6086"
+$as_echo "$at_srcdir/ofproto-dpif.at:6085: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6085"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6086"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6085"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149696,7 +150179,7 @@
 done
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6091: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:6090: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -149706,7 +150189,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6091"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6090"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -149717,7 +150200,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -149725,52 +150208,52 @@
 recirc_id=0,ip,in_port=1,vlan_tci=0x0000/0x1fff,dl_src=50:54:00:00:00:0b,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6091"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6090"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6095: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6095"
+$as_echo "$at_srcdir/ofproto-dpif.at:6094: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6094"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6095"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6094"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6095: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6095"
+$as_echo "$at_srcdir/ofproto-dpif.at:6094: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6094"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6095"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6094"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6095: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6095"
+$as_echo "$at_srcdir/ofproto-dpif.at:6094: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6094"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6095"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6094"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149780,13 +150263,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_903
-#AT_START_904
-at_fn_group_banner 904 'ofproto-dpif.at:6098' \
+#AT_STOP_905
+#AT_START_906
+at_fn_group_banner 906 'ofproto-dpif.at:6097' \
   "ofproto-dpif megaflow - tunnels" "                " 53
 at_xfail=no
 (
-  $as_echo "904. $at_setup_line: testing $at_desc ..."
+  $as_echo "906. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -149796,29 +150279,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6099: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6099"
+$as_echo "$at_srcdir/ofproto-dpif.at:6098: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6098"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6099"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6098"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6099: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6099"
+$as_echo "$at_srcdir/ofproto-dpif.at:6098: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6098"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6099"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6098"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -149828,49 +150311,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6099: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6098: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6099"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6098"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6099"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6098"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6099: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6099"
+$as_echo "$at_srcdir/ofproto-dpif.at:6098: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6098"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6099"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6099: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6099"
+$as_echo "$at_srcdir/ofproto-dpif.at:6098: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6098"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6099"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -149882,14 +150365,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6099: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6098: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6099"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6098"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -149897,12 +150380,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6099"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149911,15 +150394,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6099: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 "
-at_fn_check_prepare_trace "ofproto-dpif.at:6099"
+$as_echo "$at_srcdir/ofproto-dpif.at:6098: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 "
+at_fn_check_prepare_trace "ofproto-dpif.at:6098"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6099"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -149927,68 +150410,68 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6101: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:6101"
+$as_echo "$at_srcdir/ofproto-dpif.at:6100: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:6100"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6102: ovs-vsctl add-port br0 p2 -- set Interface p2 type=gre \\
+$as_echo "$at_srcdir/ofproto-dpif.at:6101: ovs-vsctl add-port br0 p2 -- set Interface p2 type=gre \\
      options:remote_ip=1.1.1.1 ofport_request=2 options:key=flow"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6102"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6101"
 ( $at_check_trace; ovs-vsctl add-port br0 p2 -- set Interface p2 type=gre \
      options:remote_ip=1.1.1.1 ofport_request=2 options:key=flow
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6102"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6104: ovs-vsctl add-port br0 p3 -- set Interface p3 type=dummy \\
+$as_echo "$at_srcdir/ofproto-dpif.at:6103: ovs-vsctl add-port br0 p3 -- set Interface p3 type=dummy \\
           ofport_request=3"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6103"
 ( $at_check_trace; ovs-vsctl add-port br0 p3 -- set Interface p3 type=dummy \
           ofport_request=3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6103"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6106: ovs-vsctl add-port br0 p4 -- set Interface p4 type=gre \\
+$as_echo "$at_srcdir/ofproto-dpif.at:6105: ovs-vsctl add-port br0 p4 -- set Interface p4 type=gre \\
      options:remote_ip=1.1.1.2 options:tos=inherit options:ttl=inherit \\
      ofport_request=4 options:key=flow"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6106"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6105"
 ( $at_check_trace; ovs-vsctl add-port br0 p4 -- set Interface p4 type=gre \
      options:remote_ip=1.1.1.2 options:tos=inherit options:ttl=inherit \
      ofport_request=4 options:key=flow
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6106"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6105"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150000,30 +150483,30 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6113: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:6113"
+$as_echo "$at_srcdir/ofproto-dpif.at:6112: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:6112"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6113"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6112"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6116: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0xfd,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6116"
+$as_echo "$at_srcdir/ofproto-dpif.at:6115: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0xfd,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6115"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0xfd,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6116"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6115"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150031,30 +150514,30 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6118: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0x1,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6118"
+$as_echo "$at_srcdir/ofproto-dpif.at:6117: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0x1,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6117"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0x1,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6118"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6117"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6119: ovs-appctl netdev-dummy/receive p3 'in_port(3),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0xfd,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6119"
+$as_echo "$at_srcdir/ofproto-dpif.at:6118: ovs-appctl netdev-dummy/receive p3 'in_port(3),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0xfd,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6118"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p3 'in_port(3),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0xfd,ttl=128,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6119"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6118"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150062,15 +150545,15 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6121: ovs-appctl netdev-dummy/receive p3 'in_port(3),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0x1,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6121"
+$as_echo "$at_srcdir/ofproto-dpif.at:6120: ovs-appctl netdev-dummy/receive p3 'in_port(3),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0x1,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6120"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p3 'in_port(3),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0x1,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6121"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6120"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150078,7 +150561,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6123: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:6122: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -150088,7 +150571,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6123"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6122"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -150099,7 +150582,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -150108,52 +150591,52 @@
 recirc_id=0,ip,in_port=3,nw_tos=252,nw_ecn=1,nw_ttl=128,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6122"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6128: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6128"
+$as_echo "$at_srcdir/ofproto-dpif.at:6127: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6127"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6128"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6127"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6128: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6128"
+$as_echo "$at_srcdir/ofproto-dpif.at:6127: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6127"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6128"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6127"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6128: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6128"
+$as_echo "$at_srcdir/ofproto-dpif.at:6127: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6127"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6128"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6127"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150163,13 +150646,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_904
-#AT_START_905
-at_fn_group_banner 905 'ofproto-dpif.at:6131' \
+#AT_STOP_906
+#AT_START_907
+at_fn_group_banner 907 'ofproto-dpif.at:6130' \
   "ofproto-dpif megaflow - dec_ttl" "                " 53
 at_xfail=no
 (
-  $as_echo "905. $at_setup_line: testing $at_desc ..."
+  $as_echo "907. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -150179,29 +150662,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6132: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6132"
+$as_echo "$at_srcdir/ofproto-dpif.at:6131: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6131"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6131"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6132: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6132"
+$as_echo "$at_srcdir/ofproto-dpif.at:6131: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6131"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6131"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -150211,49 +150694,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6132: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6131: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6132"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6131"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6131"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6132: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6132"
+$as_echo "$at_srcdir/ofproto-dpif.at:6131: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6131"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6131"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6132: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6132"
+$as_echo "$at_srcdir/ofproto-dpif.at:6131: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6131"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6131"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -150265,14 +150748,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6132: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6131: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6132"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6131"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -150280,12 +150763,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6131"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150294,15 +150777,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6132: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6132"
+$as_echo "$at_srcdir/ofproto-dpif.at:6131: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6131"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6131"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150310,15 +150793,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6133: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:6133"
+$as_echo "$at_srcdir/ofproto-dpif.at:6132: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:6132"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6133"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150328,15 +150811,15 @@
     -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
     -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6135: ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0 prefixes=nw_dst,nw_src"
-at_fn_check_prepare_trace "ofproto-dpif.at:6135"
+$as_echo "$at_srcdir/ofproto-dpif.at:6134: ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0 prefixes=nw_dst,nw_src"
+at_fn_check_prepare_trace "ofproto-dpif.at:6134"
 ( $at_check_trace; ovs-vsctl set Bridge br0 flow_tables:0=@N1 -- --id=@N1 create Flow_Table name=t0 prefixes=nw_dst,nw_src
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150347,45 +150830,45 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6139: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:6139"
+$as_echo "$at_srcdir/ofproto-dpif.at:6138: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:6138"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6139"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6138"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6140: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6140"
+$as_echo "$at_srcdir/ofproto-dpif.at:6139: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6139"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6140"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6139"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6141: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6141"
+$as_echo "$at_srcdir/ofproto-dpif.at:6140: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6140"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6141"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6140"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150393,7 +150876,7 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6143: cat ovs-vswitchd.log |
+$as_echo "$at_srcdir/ofproto-dpif.at:6142: cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -150403,7 +150886,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6143"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6142"
 ( $at_check_trace; cat ovs-vswitchd.log |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -150414,7 +150897,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -150422,52 +150905,52 @@
 recirc_id=0,ip,in_port=1,nw_src=10.0.0.2/0.0.0.2,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6143"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6147: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6147"
+$as_echo "$at_srcdir/ofproto-dpif.at:6146: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6146"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6147"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6146"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6147: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6147"
+$as_echo "$at_srcdir/ofproto-dpif.at:6146: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6146"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6147"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6146"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6147: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6147"
+$as_echo "$at_srcdir/ofproto-dpif.at:6146: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6146"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6147"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6146"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150477,13 +150960,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_905
-#AT_START_906
-at_fn_group_banner 906 'ofproto-dpif.at:6150' \
+#AT_STOP_907
+#AT_START_908
+at_fn_group_banner 908 'ofproto-dpif.at:6149' \
   "ofproto-dpif megaflow - set dl_dst" "             " 53
 at_xfail=no
 (
-  $as_echo "906. $at_setup_line: testing $at_desc ..."
+  $as_echo "908. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -150493,29 +150976,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6151: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6151"
+$as_echo "$at_srcdir/ofproto-dpif.at:6150: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6150"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6151"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6150"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6151: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6151"
+$as_echo "$at_srcdir/ofproto-dpif.at:6150: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6150"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6151"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6150"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -150525,49 +151008,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6151: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6150: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6151"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6150"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6151"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6150"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6151: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6151"
+$as_echo "$at_srcdir/ofproto-dpif.at:6150: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6150"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6151"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6150"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6151: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6151"
+$as_echo "$at_srcdir/ofproto-dpif.at:6150: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6150"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6151"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6150"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -150579,14 +151062,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6151: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6150: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6151"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6150"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -150594,12 +151077,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6151"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6150"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150608,15 +151091,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6151: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6151"
+$as_echo "$at_srcdir/ofproto-dpif.at:6150: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6150"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6151"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6150"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150624,15 +151107,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6152: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:6152"
+$as_echo "$at_srcdir/ofproto-dpif.at:6151: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:6151"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6152"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6151"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150646,45 +151129,45 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6157: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:6157"
+$as_echo "$at_srcdir/ofproto-dpif.at:6156: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:6156"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6156"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6158: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6158"
+$as_echo "$at_srcdir/ofproto-dpif.at:6157: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6157"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6158"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6157"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6159: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6159"
+$as_echo "$at_srcdir/ofproto-dpif.at:6158: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6158"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6159"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6158"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150692,16 +151175,16 @@
 
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6164: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
+$as_echo "$at_srcdir/ofproto-dpif.at:6163: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed 's/used:[0-9]\\.[0-9]*/used:0.0/'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6164"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6163"
 ( $at_check_trace; cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed 's/used:[0-9]\.[0-9]*/used:0.0/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -150709,52 +151192,52 @@
 recirc_id=0,ip,in_port=1,dl_dst=50:54:00:00:00:0c,nw_frag=no, actions:set(eth(dst=50:54:00:00:00:0a)),2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6164"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6163"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6168: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6168"
+$as_echo "$at_srcdir/ofproto-dpif.at:6167: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6167"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6168"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6168: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6168"
+$as_echo "$at_srcdir/ofproto-dpif.at:6167: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6167"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6168"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6168: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6168"
+$as_echo "$at_srcdir/ofproto-dpif.at:6167: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6167"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6168"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150764,13 +151247,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_906
-#AT_START_907
-at_fn_group_banner 907 'ofproto-dpif.at:6171' \
+#AT_STOP_908
+#AT_START_909
+at_fn_group_banner 909 'ofproto-dpif.at:6170' \
   "ofproto-dpif megaflow - disabled" "               " 53
 at_xfail=no
 (
-  $as_echo "907. $at_setup_line: testing $at_desc ..."
+  $as_echo "909. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -150780,29 +151263,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6172: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6172"
+$as_echo "$at_srcdir/ofproto-dpif.at:6171: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6171"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6172"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6171"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6172: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6172"
+$as_echo "$at_srcdir/ofproto-dpif.at:6171: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6171"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6172"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6171"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -150812,49 +151295,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6172: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6171: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6172"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6171"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6172"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6171"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6172: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6172"
+$as_echo "$at_srcdir/ofproto-dpif.at:6171: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6171"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6172"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6171"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6172: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6172"
+$as_echo "$at_srcdir/ofproto-dpif.at:6171: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6171"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6172"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6171"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -150866,14 +151349,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6172: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6171: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6172"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6171"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -150881,12 +151364,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6172"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6171"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150895,15 +151378,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6172: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6172"
+$as_echo "$at_srcdir/ofproto-dpif.at:6171: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6171"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6172"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6171"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150911,15 +151394,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6173: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:6173"
+$as_echo "$at_srcdir/ofproto-dpif.at:6172: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:6172"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6173"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6172"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150934,64 +151417,64 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6179: ovs-appctl upcall/disable-megaflows"
-at_fn_check_prepare_trace "ofproto-dpif.at:6179"
+$as_echo "$at_srcdir/ofproto-dpif.at:6178: ovs-appctl upcall/disable-megaflows"
+at_fn_check_prepare_trace "ofproto-dpif.at:6178"
 ( $at_check_trace; ovs-appctl upcall/disable-megaflows
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "megaflows disabled
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6179"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6181: ovs-appctl upcall/disable-ufid"
-at_fn_check_prepare_trace "ofproto-dpif.at:6181"
+$as_echo "$at_srcdir/ofproto-dpif.at:6180: ovs-appctl upcall/disable-ufid"
+at_fn_check_prepare_trace "ofproto-dpif.at:6180"
 ( $at_check_trace; ovs-appctl upcall/disable-ufid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath dumping tersely using UFID disabled
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6181"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6180"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6183: ovs-appctl vlog/set dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:6183"
+$as_echo "$at_srcdir/ofproto-dpif.at:6182: ovs-appctl vlog/set dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:6182"
 ( $at_check_trace; ovs-appctl vlog/set dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6183"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6182"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6184: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:6184"
+$as_echo "$at_srcdir/ofproto-dpif.at:6183: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:6183"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6184"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6183"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -150999,30 +151482,30 @@
 
 for i in 1 2 3 4; do
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6186: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6186"
+$as_echo "$at_srcdir/ofproto-dpif.at:6185: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6185"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6186"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6185"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6187: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6187"
+$as_echo "$at_srcdir/ofproto-dpif.at:6186: ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6186"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6186"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151034,16 +151517,16 @@
 done
 sleep 1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6193: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
+$as_echo "$at_srcdir/ofproto-dpif.at:6192: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed 's/used:[0-9]\\.[0-9]*/used:0.0/'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6193"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6192"
 ( $at_check_trace; cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed 's/used:[0-9]\.[0-9]*/used:0.0/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -151051,25 +151534,25 @@
 pkt_mark=0,recirc_id=0,dp_hash=0,skb_priority=0,icmp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:0b,dl_dst=50:54:00:00:00:0c,nw_src=10.0.0.4,nw_dst=10.0.0.3,nw_tos=0,nw_ecn=0,nw_ttl=64,icmp_type=8,icmp_code=0, actions:drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6193"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6192"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6197: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
+$as_echo "$at_srcdir/ofproto-dpif.at:6196: cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_dump ' | sed '
     s/.*flow_dump //
     s/used:[0-9]*\\.[0-9]*/used:0.0/
 ' | sort | uniq | grep 'packets:3'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6196"
 ( $at_check_trace; cat ovs-vswitchd.log | sed 's/ufid:[-0-9a-f]* //' |
 grep 'flow_dump ' | sed '
     s/.*flow_dump //
     s/used:[0-9]*\.[0-9]*/used:0.0/
 ' | sort | uniq | grep 'packets:3'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -151077,52 +151560,52 @@
 skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0), packets:3, bytes:180, used:0.0s, actions:drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6196"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6201: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6201"
+$as_echo "$at_srcdir/ofproto-dpif.at:6200: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6200"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6201"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6201: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6201"
+$as_echo "$at_srcdir/ofproto-dpif.at:6200: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6200"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6201"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6201: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6201"
+$as_echo "$at_srcdir/ofproto-dpif.at:6200: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6200"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6201"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151132,13 +151615,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_907
-#AT_START_908
-at_fn_group_banner 908 'ofproto-dpif.at:6204' \
+#AT_STOP_909
+#AT_START_910
+at_fn_group_banner 910 'ofproto-dpif.at:6203' \
   "ofproto-dpif - datapath port number change" "     " 53
 at_xfail=no
 (
-  $as_echo "908. $at_setup_line: testing $at_desc ..."
+  $as_echo "910. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -151148,29 +151631,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6205: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6205"
+$as_echo "$at_srcdir/ofproto-dpif.at:6204: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6204"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6205"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6204"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6205: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6205"
+$as_echo "$at_srcdir/ofproto-dpif.at:6204: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6204"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6205"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6204"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -151180,49 +151663,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6205: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6204: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6205"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6204"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6205"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6204"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6205: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6205"
+$as_echo "$at_srcdir/ofproto-dpif.at:6204: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6204"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6205"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6204"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6205: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6205"
+$as_echo "$at_srcdir/ofproto-dpif.at:6204: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6204"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6205"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6204"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -151234,14 +151717,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6205: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6204: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6205"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6204"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -151249,12 +151732,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6205"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6204"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151263,15 +151746,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6205: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
-at_fn_check_prepare_trace "ofproto-dpif.at:6205"
+$as_echo "$at_srcdir/ofproto-dpif.at:6204: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone "
+at_fn_check_prepare_trace "ofproto-dpif.at:6204"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- set Bridge br0 fail-mode=standalone
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6205"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6204"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151283,32 +151766,32 @@
 
 # Trace a flow that should output to p1.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6209: ovs-appctl ofproto/trace br0 in_port=LOCAL,dl_src=10:20:30:40:50:60"
-at_fn_check_prepare_trace "ofproto-dpif.at:6209"
+$as_echo "$at_srcdir/ofproto-dpif.at:6208: ovs-appctl ofproto/trace br0 in_port=LOCAL,dl_src=10:20:30:40:50:60"
+at_fn_check_prepare_trace "ofproto-dpif.at:6208"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 in_port=LOCAL,dl_src=10:20:30:40:50:60
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6209"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6211: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:6211"
+$as_echo "$at_srcdir/ofproto-dpif.at:6210: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:6210"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6211"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151317,15 +151800,15 @@
 
 # Change p1's port number to 5.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6215: ovs-appctl dpif-dummy/change-port-number ovs-dummy p1 5"
-at_fn_check_prepare_trace "ofproto-dpif.at:6215"
+$as_echo "$at_srcdir/ofproto-dpif.at:6214: ovs-appctl dpif-dummy/change-port-number ovs-dummy p1 5"
+at_fn_check_prepare_trace "ofproto-dpif.at:6214"
 ( $at_check_trace; ovs-appctl dpif-dummy/change-port-number ovs-dummy p1 5
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6215"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6214"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151334,77 +151817,77 @@
 
 # Trace a flow that should output to p1 in its new location.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6218: ovs-appctl ofproto/trace br0 in_port=LOCAL,dl_src=10:20:30:40:50:60"
-at_fn_check_prepare_trace "ofproto-dpif.at:6218"
+$as_echo "$at_srcdir/ofproto-dpif.at:6217: ovs-appctl ofproto/trace br0 in_port=LOCAL,dl_src=10:20:30:40:50:60"
+at_fn_check_prepare_trace "ofproto-dpif.at:6217"
 ( $at_check_trace; ovs-appctl ofproto/trace br0 in_port=LOCAL,dl_src=10:20:30:40:50:60
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6218"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6217"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6220: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:6220"
+$as_echo "$at_srcdir/ofproto-dpif.at:6219: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:6219"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: 5
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6220"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6219"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6222: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6222"
+$as_echo "$at_srcdir/ofproto-dpif.at:6221: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6221"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6221"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6222: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6222"
+$as_echo "$at_srcdir/ofproto-dpif.at:6221: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6221"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6221"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6222: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6222"
+$as_echo "$at_srcdir/ofproto-dpif.at:6221: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6221"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6221"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151414,13 +151897,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_908
-#AT_START_909
-at_fn_group_banner 909 'ofproto-dpif.at:6226' \
+#AT_STOP_910
+#AT_START_911
+at_fn_group_banner 911 'ofproto-dpif.at:6225' \
   "ofproto - bundle with variable bfd/cfm config" "  " 53
 at_xfail=no
 (
-  $as_echo "909. $at_setup_line: testing $at_desc ..."
+  $as_echo "911. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -151430,29 +151913,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6227: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6227"
+$as_echo "$at_srcdir/ofproto-dpif.at:6226: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6226"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6226"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6227: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6227"
+$as_echo "$at_srcdir/ofproto-dpif.at:6226: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6226"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6226"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -151462,49 +151945,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6227: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6226: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6227"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6226"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6226"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6227: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6227"
+$as_echo "$at_srcdir/ofproto-dpif.at:6226: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6226"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6226"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6227: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6227"
+$as_echo "$at_srcdir/ofproto-dpif.at:6226: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6226"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6226"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -151516,14 +151999,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6227: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6226: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6227"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6226"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -151531,12 +152014,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6226"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151545,7 +152028,7 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6227: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- set bridge br1 datapath-type=dummy -- \\
+$as_echo "$at_srcdir/ofproto-dpif.at:6226: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- set bridge br1 datapath-type=dummy -- \\
                     add-bond br0 br0bond p0 p2 bond-mode=active-backup -- \\
                     add-bond br1 br1bond p1 p3 bond-mode=active-backup -- \\
                     set Interface p1 type=patch options:peer=p0 ofport_request=2 -- \\
@@ -151555,7 +152038,7 @@
                     set Interface p0 bfd:enable=true bfd:min_tx=300 bfd:min_rx=300 -- \\
                     set Interface p0 cfm_mpid=1 -- \\
                     set Interface p1 bfd:enable=true bfd:min_tx=500 bfd:min_rx=500 "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6227"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6226"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-br br1 -- set bridge br1 datapath-type=dummy -- \
                     add-bond br0 br0bond p0 p2 bond-mode=active-backup -- \
                     add-bond br1 br1bond p1 p3 bond-mode=active-backup -- \
@@ -151566,12 +152049,12 @@
                     set Interface p0 bfd:enable=true bfd:min_tx=300 bfd:min_rx=300 -- \
                     set Interface p0 cfm_mpid=1 -- \
                     set Interface p1 bfd:enable=true bfd:min_tx=500 bfd:min_rx=500
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6226"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151584,17 +152067,17 @@
 ovs-appctl time/warp 5000 100
 # cfm/show should show 'recv' fault.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6242: ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6242"
+$as_echo "$at_srcdir/ofproto-dpif.at:6241: ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6241"
 ( $at_check_trace; ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "	fault: recv
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6242"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151602,10 +152085,10 @@
 
 # bfd/show should show 'up'.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6246: ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6246"
+$as_echo "$at_srcdir/ofproto-dpif.at:6245: ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6245"
 ( $at_check_trace; ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -151615,7 +152098,7 @@
 	Remote Session State: up
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6246"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6245"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151623,10 +152106,10 @@
 
 # bond/show should show 'may-enable: true' for all slaves.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6253: ovs-appctl bond/show | sed -n '/^.*may_enable:.*/p'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6253"
+$as_echo "$at_srcdir/ofproto-dpif.at:6252: ovs-appctl bond/show | sed -n '/^.*may_enable:.*/p'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6252"
 ( $at_check_trace; ovs-appctl bond/show | sed -n '/^.*may_enable:.*/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -151636,7 +152119,7 @@
 	may_enable: true
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6253"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6252"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151645,15 +152128,15 @@
 
 # now disable the bfd on p1.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6261: ovs-vsctl set Interface p1 bfd:enable=false"
-at_fn_check_prepare_trace "ofproto-dpif.at:6261"
+$as_echo "$at_srcdir/ofproto-dpif.at:6260: ovs-vsctl set Interface p1 bfd:enable=false"
+at_fn_check_prepare_trace "ofproto-dpif.at:6260"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6261"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6260"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151663,17 +152146,17 @@
 ovs-appctl time/warp 5000 100
 # cfm/show should show 'recv' fault.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6265: ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6265"
+$as_echo "$at_srcdir/ofproto-dpif.at:6264: ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6264"
 ( $at_check_trace; ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "	fault: recv
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6265"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6264"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151681,10 +152164,10 @@
 
 # bfd/show should show 'down'.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6269: ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6269"
+$as_echo "$at_srcdir/ofproto-dpif.at:6268: ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6268"
 ( $at_check_trace; ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -151692,7 +152175,7 @@
 	Remote Session State: down
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6269"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6268"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151700,10 +152183,10 @@
 
 # bond/show should show 'may-enable: false' for p0.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6274: ovs-appctl bond/show br0bond | sed -n '/^.*may_enable:.*/p'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6274"
+$as_echo "$at_srcdir/ofproto-dpif.at:6273: ovs-appctl bond/show br0bond | sed -n '/^.*may_enable:.*/p'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6273"
 ( $at_check_trace; ovs-appctl bond/show br0bond | sed -n '/^.*may_enable:.*/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -151711,7 +152194,7 @@
 	may_enable: true
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6274"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151720,30 +152203,30 @@
 
 # now enable the bfd on p1 and disable bfd on p0.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6280: ovs-vsctl set Interface p1 bfd:enable=true"
-at_fn_check_prepare_trace "ofproto-dpif.at:6280"
+$as_echo "$at_srcdir/ofproto-dpif.at:6279: ovs-vsctl set Interface p1 bfd:enable=true"
+at_fn_check_prepare_trace "ofproto-dpif.at:6279"
 ( $at_check_trace; ovs-vsctl set Interface p1 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6280"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6279"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6281: ovs-vsctl set Interface p0 bfd:enable=false"
-at_fn_check_prepare_trace "ofproto-dpif.at:6281"
+$as_echo "$at_srcdir/ofproto-dpif.at:6280: ovs-vsctl set Interface p0 bfd:enable=false"
+at_fn_check_prepare_trace "ofproto-dpif.at:6280"
 ( $at_check_trace; ovs-vsctl set Interface p0 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6281"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6280"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151753,17 +152236,17 @@
 ovs-appctl time/warp 5000 100
 # cfm/show should show 'recv' fault.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6285: ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6285"
+$as_echo "$at_srcdir/ofproto-dpif.at:6284: ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6284"
 ( $at_check_trace; ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "	fault: recv
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6285"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6284"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151771,10 +152254,10 @@
 
 # bfd/show should show 'down'.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6289: ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6289"
+$as_echo "$at_srcdir/ofproto-dpif.at:6288: ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6288"
 ( $at_check_trace; ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -151782,7 +152265,7 @@
 	Remote Session State: down
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6289"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6288"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151790,10 +152273,10 @@
 
 # bond/show should show 'may-enable: false' for p0 and p1.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6294: ovs-appctl bond/show | sed -n '/^.*may_enable:.*/p'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6294"
+$as_echo "$at_srcdir/ofproto-dpif.at:6293: ovs-appctl bond/show | sed -n '/^.*may_enable:.*/p'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6293"
 ( $at_check_trace; ovs-appctl bond/show | sed -n '/^.*may_enable:.*/p'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -151803,7 +152286,7 @@
 	may_enable: true
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6294"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6293"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151811,45 +152294,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6301: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6301"
+$as_echo "$at_srcdir/ofproto-dpif.at:6300: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6300"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6301"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6300"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6301: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6301"
+$as_echo "$at_srcdir/ofproto-dpif.at:6300: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6300"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6301"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6300"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6301: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6301"
+$as_echo "$at_srcdir/ofproto-dpif.at:6300: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6300"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6301"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6300"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151859,13 +152342,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_909
-#AT_START_910
-at_fn_group_banner 910 'ofproto-dpif.at:6304' \
+#AT_STOP_911
+#AT_START_912
+at_fn_group_banner 912 'ofproto-dpif.at:6303' \
   "ofproto-dpif - ofproto-dpif-monitor 1" "          " 53
 at_xfail=no
 (
-  $as_echo "910. $at_setup_line: testing $at_desc ..."
+  $as_echo "912. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -151875,29 +152358,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6305: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6305"
+$as_echo "$at_srcdir/ofproto-dpif.at:6304: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6304"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6305"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6304"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6305: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6305"
+$as_echo "$at_srcdir/ofproto-dpif.at:6304: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6304"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6305"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6304"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -151907,49 +152390,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6305: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6304: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6305"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6304"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6305"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6304"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6305: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6305"
+$as_echo "$at_srcdir/ofproto-dpif.at:6304: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6304"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6305"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6304"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6305: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6305"
+$as_echo "$at_srcdir/ofproto-dpif.at:6304: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6304"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6305"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6304"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -151961,14 +152444,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6305: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6304: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6305"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6304"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -151976,12 +152459,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6305"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6304"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -151990,15 +152473,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6305: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set interface p0 type=gre options:remote_ip=1.2.3.4 "
-at_fn_check_prepare_trace "ofproto-dpif.at:6305"
+$as_echo "$at_srcdir/ofproto-dpif.at:6304: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set interface p0 type=gre options:remote_ip=1.2.3.4 "
+at_fn_check_prepare_trace "ofproto-dpif.at:6304"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set interface p0 type=gre options:remote_ip=1.2.3.4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6305"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6304"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152008,15 +152491,15 @@
 
 # enable bfd on p0.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6308: ovs-vsctl set interface p0 bfd:enable=true"
-at_fn_check_prepare_trace "ofproto-dpif.at:6308"
+$as_echo "$at_srcdir/ofproto-dpif.at:6307: ovs-vsctl set interface p0 bfd:enable=true"
+at_fn_check_prepare_trace "ofproto-dpif.at:6307"
 ( $at_check_trace; ovs-vsctl set interface p0 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6308"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6307"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152024,19 +152507,19 @@
 
 # check log.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6310: ovs_wait_cond () { grep \"monitor thread created\" ovs-vswitchd.log
+$as_echo "$at_srcdir/ofproto-dpif.at:6309: ovs_wait_cond () { grep \"monitor thread created\" ovs-vswitchd.log
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6310"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6309"
 ( $at_check_trace; ovs_wait_cond () { grep "monitor thread created" ovs-vswitchd.log
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6310"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6309"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152044,15 +152527,15 @@
 
 # disable bfd on p0.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6312: ovs-vsctl set interface p0 bfd:enable=false"
-at_fn_check_prepare_trace "ofproto-dpif.at:6312"
+$as_echo "$at_srcdir/ofproto-dpif.at:6311: ovs-vsctl set interface p0 bfd:enable=false"
+at_fn_check_prepare_trace "ofproto-dpif.at:6311"
 ( $at_check_trace; ovs-vsctl set interface p0 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6312"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152060,34 +152543,34 @@
 
 # check log.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6314: ovs_wait_cond () { grep \"monitor thread terminated\" ovs-vswitchd.log
+$as_echo "$at_srcdir/ofproto-dpif.at:6313: ovs_wait_cond () { grep \"monitor thread terminated\" ovs-vswitchd.log
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6314"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6313"
 ( $at_check_trace; ovs_wait_cond () { grep "monitor thread terminated" ovs-vswitchd.log
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6314"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6313"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6315: cat ovs-vswitchd.log | sed -e '/^.*ofproto_dpif_monitor.*\$/d' > ovs-vswitchd.log"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6315"
+$as_echo "$at_srcdir/ofproto-dpif.at:6314: cat ovs-vswitchd.log | sed -e '/^.*ofproto_dpif_monitor.*\$/d' > ovs-vswitchd.log"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6314"
 ( $at_check_trace; cat ovs-vswitchd.log | sed -e '/^.*ofproto_dpif_monitor.*$/d' > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6315"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6314"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152096,15 +152579,15 @@
 
 # enable cfm on p0.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6318: ovs-vsctl set interface p0 cfm_mpid=10"
-at_fn_check_prepare_trace "ofproto-dpif.at:6318"
+$as_echo "$at_srcdir/ofproto-dpif.at:6317: ovs-vsctl set interface p0 cfm_mpid=10"
+at_fn_check_prepare_trace "ofproto-dpif.at:6317"
 ( $at_check_trace; ovs-vsctl set interface p0 cfm_mpid=10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6318"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6317"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152112,19 +152595,19 @@
 
 # check log.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6320: ovs_wait_cond () { grep \"monitor thread created\" ovs-vswitchd.log
+$as_echo "$at_srcdir/ofproto-dpif.at:6319: ovs_wait_cond () { grep \"monitor thread created\" ovs-vswitchd.log
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6320"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6319"
 ( $at_check_trace; ovs_wait_cond () { grep "monitor thread created" ovs-vswitchd.log
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6320"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6319"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152132,15 +152615,15 @@
 
 # disable cfm on p0.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6322: ovs-vsctl remove interface p0 cfm_mpid 10"
-at_fn_check_prepare_trace "ofproto-dpif.at:6322"
+$as_echo "$at_srcdir/ofproto-dpif.at:6321: ovs-vsctl remove interface p0 cfm_mpid 10"
+at_fn_check_prepare_trace "ofproto-dpif.at:6321"
 ( $at_check_trace; ovs-vsctl remove interface p0 cfm_mpid 10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6322"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6321"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152148,34 +152631,34 @@
 
 # check log.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6324: ovs_wait_cond () { grep \"monitor thread terminated\" ovs-vswitchd.log
+$as_echo "$at_srcdir/ofproto-dpif.at:6323: ovs_wait_cond () { grep \"monitor thread terminated\" ovs-vswitchd.log
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6324"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6323"
 ( $at_check_trace; ovs_wait_cond () { grep "monitor thread terminated" ovs-vswitchd.log
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6324"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6323"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6325: cat ovs-vswitchd.log | sed -e '/^.*ofproto_dpif_monitor.*\$/d' > ovs-vswitchd.log"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6325"
+$as_echo "$at_srcdir/ofproto-dpif.at:6324: cat ovs-vswitchd.log | sed -e '/^.*ofproto_dpif_monitor.*\$/d' > ovs-vswitchd.log"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6324"
 ( $at_check_trace; cat ovs-vswitchd.log | sed -e '/^.*ofproto_dpif_monitor.*$/d' > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6325"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6324"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152184,15 +152667,15 @@
 
 # enable both bfd and cfm on p0.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6328: ovs-vsctl set interface p0 bfd:enable=true cfm_mpid=10"
-at_fn_check_prepare_trace "ofproto-dpif.at:6328"
+$as_echo "$at_srcdir/ofproto-dpif.at:6327: ovs-vsctl set interface p0 bfd:enable=true cfm_mpid=10"
+at_fn_check_prepare_trace "ofproto-dpif.at:6327"
 ( $at_check_trace; ovs-vsctl set interface p0 bfd:enable=true cfm_mpid=10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6328"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6327"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152200,19 +152683,19 @@
 
 # check log.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6330: ovs_wait_cond () { grep \"monitor thread created\" ovs-vswitchd.log
+$as_echo "$at_srcdir/ofproto-dpif.at:6329: ovs_wait_cond () { grep \"monitor thread created\" ovs-vswitchd.log
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6330"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6329"
 ( $at_check_trace; ovs_wait_cond () { grep "monitor thread created" ovs-vswitchd.log
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6330"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6329"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152220,15 +152703,15 @@
 
 # disable bfd on p0.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6332: ovs-vsctl set interface p0 bfd:enable=false"
-at_fn_check_prepare_trace "ofproto-dpif.at:6332"
+$as_echo "$at_srcdir/ofproto-dpif.at:6331: ovs-vsctl set interface p0 bfd:enable=false"
+at_fn_check_prepare_trace "ofproto-dpif.at:6331"
 ( $at_check_trace; ovs-vsctl set interface p0 bfd:enable=false
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6332"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6331"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152236,15 +152719,15 @@
 
 # check log, there should not be the log of thread terminated.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6334: sed -n \"s/^.*|ofproto_dpif_monitor(monitor[0-9]*)|INFO|\\(.* terminated\\)\$/\\1/p\" ovs-vswitchd.log"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6334"
+$as_echo "$at_srcdir/ofproto-dpif.at:6333: sed -n \"s/^.*|ofproto_dpif_monitor(monitor[0-9]*)|INFO|\\(.* terminated\\)\$/\\1/p\" ovs-vswitchd.log"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6333"
 ( $at_check_trace; sed -n "s/^.*|ofproto_dpif_monitor(monitor[0-9]*)|INFO|\(.* terminated\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6334"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6333"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152252,15 +152735,15 @@
 
 # reenable bfd on p0.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6337: ovs-vsctl set interface p0 bfd:enable=true"
-at_fn_check_prepare_trace "ofproto-dpif.at:6337"
+$as_echo "$at_srcdir/ofproto-dpif.at:6336: ovs-vsctl set interface p0 bfd:enable=true"
+at_fn_check_prepare_trace "ofproto-dpif.at:6336"
 ( $at_check_trace; ovs-vsctl set interface p0 bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6337"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6336"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152268,17 +152751,17 @@
 
 # check log, should still be on log of thread created.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6339: sed -n \"s/^.*|ofproto_dpif_monitor(monitor[0-9]*)|INFO|\\(.* created\\)\$/\\1/p\" ovs-vswitchd.log"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6339"
+$as_echo "$at_srcdir/ofproto-dpif.at:6338: sed -n \"s/^.*|ofproto_dpif_monitor(monitor[0-9]*)|INFO|\\(.* created\\)\$/\\1/p\" ovs-vswitchd.log"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6338"
 ( $at_check_trace; sed -n "s/^.*|ofproto_dpif_monitor(monitor[0-9]*)|INFO|\(.* created\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "monitor thread created
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6339"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6338"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152286,15 +152769,15 @@
 
 # disable bfd and cfm together.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6343: ovs-vsctl set interface p0 bfd:enable=false -- remove interface p0 cfm_mpid 10"
-at_fn_check_prepare_trace "ofproto-dpif.at:6343"
+$as_echo "$at_srcdir/ofproto-dpif.at:6342: ovs-vsctl set interface p0 bfd:enable=false -- remove interface p0 cfm_mpid 10"
+at_fn_check_prepare_trace "ofproto-dpif.at:6342"
 ( $at_check_trace; ovs-vsctl set interface p0 bfd:enable=false -- remove interface p0 cfm_mpid 10
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6343"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6342"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152302,19 +152785,19 @@
 
 # check log.
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6345: ovs_wait_cond () { grep \"monitor thread terminated\" ovs-vswitchd.log
+$as_echo "$at_srcdir/ofproto-dpif.at:6344: ovs_wait_cond () { grep \"monitor thread terminated\" ovs-vswitchd.log
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6345"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6344"
 ( $at_check_trace; ovs_wait_cond () { grep "monitor thread terminated" ovs-vswitchd.log
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6345"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6344"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152322,45 +152805,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6347: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6347"
+$as_echo "$at_srcdir/ofproto-dpif.at:6346: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6346"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6347"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6346"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6347: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6347"
+$as_echo "$at_srcdir/ofproto-dpif.at:6346: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6346"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6347"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6346"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6347: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6347"
+$as_echo "$at_srcdir/ofproto-dpif.at:6346: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6346"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6347"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6346"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152370,13 +152853,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_910
-#AT_START_911
-at_fn_group_banner 911 'ofproto-dpif.at:6351' \
+#AT_STOP_912
+#AT_START_913
+at_fn_group_banner 913 'ofproto-dpif.at:6350' \
   "ofproto-dpif - ofproto-dpif-monitor 2" "          " 53
 at_xfail=no
 (
-  $as_echo "911. $at_setup_line: testing $at_desc ..."
+  $as_echo "913. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -152386,29 +152869,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6352: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6352"
+$as_echo "$at_srcdir/ofproto-dpif.at:6351: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6351"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6352"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6351"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6352: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6352"
+$as_echo "$at_srcdir/ofproto-dpif.at:6351: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6351"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6352"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6351"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -152418,49 +152901,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6352: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6351: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6352"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6351"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6352"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6351"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6352: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6352"
+$as_echo "$at_srcdir/ofproto-dpif.at:6351: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6351"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6352"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6351"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6352: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6352"
+$as_echo "$at_srcdir/ofproto-dpif.at:6351: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6351"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6352"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6351"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -152472,14 +152955,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6352: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6351: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6352"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6351"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -152487,12 +152970,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6352"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6351"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152501,15 +152984,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6352: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6352"
+$as_echo "$at_srcdir/ofproto-dpif.at:6351: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6351"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6352"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6351"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152520,15 +153003,15 @@
 for i in `seq 1 199`
 do
     { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6356: ovs-vsctl add-port br0 p\$i -- set interface p\$i type=gre options:remote_ip=1.2.3.4 options:key=\$i bfd:enable=true"
-at_fn_check_prepare_dynamic "ovs-vsctl add-port br0 p$i -- set interface p$i type=gre options:remote_ip=1.2.3.4 options:key=$i bfd:enable=true" "ofproto-dpif.at:6356"
+$as_echo "$at_srcdir/ofproto-dpif.at:6355: ovs-vsctl add-port br0 p\$i -- set interface p\$i type=gre options:remote_ip=1.2.3.4 options:key=\$i bfd:enable=true"
+at_fn_check_prepare_dynamic "ovs-vsctl add-port br0 p$i -- set interface p$i type=gre options:remote_ip=1.2.3.4 options:key=$i bfd:enable=true" "ofproto-dpif.at:6355"
 ( $at_check_trace; ovs-vsctl add-port br0 p$i -- set interface p$i type=gre options:remote_ip=1.2.3.4 options:key=$i bfd:enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6356"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6355"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152537,45 +153020,45 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6359: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6359"
+$as_echo "$at_srcdir/ofproto-dpif.at:6358: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6358"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6359"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6358"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6359: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6359"
+$as_echo "$at_srcdir/ofproto-dpif.at:6358: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6358"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6359"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6358"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6359: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6359"
+$as_echo "$at_srcdir/ofproto-dpif.at:6358: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6358"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6359"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6358"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152585,13 +153068,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_911
-#AT_START_912
-at_fn_group_banner 912 'ofproto-dpif.at:6364' \
+#AT_STOP_913
+#AT_START_914
+at_fn_group_banner 914 'ofproto-dpif.at:6363' \
   "ofproto-dpif - infinite resubmit" "               " 54
 at_xfail=no
 (
-  $as_echo "912. $at_setup_line: testing $at_desc ..."
+  $as_echo "914. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -152601,29 +153084,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6365: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6365"
+$as_echo "$at_srcdir/ofproto-dpif.at:6364: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6364"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6365"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6364"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6365: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6365"
+$as_echo "$at_srcdir/ofproto-dpif.at:6364: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6364"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6365"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6364"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -152633,49 +153116,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6365: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6364: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6365"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6364"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6365"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6364"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6365: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6365"
+$as_echo "$at_srcdir/ofproto-dpif.at:6364: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6364"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6365"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6364"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6365: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6365"
+$as_echo "$at_srcdir/ofproto-dpif.at:6364: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6364"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6365"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6364"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -152687,14 +153170,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6365: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6364: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6365"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6364"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -152702,12 +153185,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6365"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6364"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152716,15 +153199,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6365: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6365"
+$as_echo "$at_srcdir/ofproto-dpif.at:6364: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6364"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6365"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6364"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152732,109 +153215,109 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6366: ovs-ofctl add-flow br0 actions=resubmit:1,resubmit:2,output:3"
-at_fn_check_prepare_trace "ofproto-dpif.at:6366"
+$as_echo "$at_srcdir/ofproto-dpif.at:6365: ovs-ofctl add-flow br0 actions=resubmit:1,resubmit:2,output:3"
+at_fn_check_prepare_trace "ofproto-dpif.at:6365"
 ( $at_check_trace; ovs-ofctl add-flow br0 actions=resubmit:1,resubmit:2,output:3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6366"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6365"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6367: ovs-appctl -vpoll_loop:off ofproto/trace br0 'eth_dst=ff:ff:ff:ff:ff:ff'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6367"
+$as_echo "$at_srcdir/ofproto-dpif.at:6366: ovs-appctl -vpoll_loop:off ofproto/trace br0 'eth_dst=ff:ff:ff:ff:ff:ff'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6366"
 ( $at_check_trace; ovs-appctl -vpoll_loop:off ofproto/trace br0 'eth_dst=ff:ff:ff:ff:ff:ff'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6367"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6366"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6369: tail -1 stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:6369"
+$as_echo "$at_srcdir/ofproto-dpif.at:6368: tail -1 stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:6368"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "Datapath actions: drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6369"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6368"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6371: grep -c 'resubmit actions recursed over 64 times' ovs-vswitchd.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6371"
+$as_echo "$at_srcdir/ofproto-dpif.at:6370: grep -c 'resubmit actions recursed over 64 times' ovs-vswitchd.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6370"
 ( $at_check_trace; grep -c 'resubmit actions recursed over 64 times' ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6371"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6370"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6374: check_logs \"/resubmit actions recursed/d\""
-at_fn_check_prepare_trace "ofproto-dpif.at:6374"
+$as_echo "$at_srcdir/ofproto-dpif.at:6373: check_logs \"/resubmit actions recursed/d\""
+at_fn_check_prepare_trace "ofproto-dpif.at:6373"
 ( $at_check_trace; check_logs "/resubmit actions recursed/d"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6374"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6373"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6374: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6374"
+$as_echo "$at_srcdir/ofproto-dpif.at:6373: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6373"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6374"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6373"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6374: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6374"
+$as_echo "$at_srcdir/ofproto-dpif.at:6373: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6373"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6374"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6373"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152844,13 +153327,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_912
-#AT_START_913
-at_fn_group_banner 913 'ofproto-dpif.at:6377' \
+#AT_STOP_914
+#AT_START_915
+at_fn_group_banner 915 'ofproto-dpif.at:6376' \
   "ofproto-dpif - exponential resubmit chain" "      " 54
 at_xfail=no
 (
-  $as_echo "913. $at_setup_line: testing $at_desc ..."
+  $as_echo "915. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -152860,29 +153343,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6378: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6378"
+$as_echo "$at_srcdir/ofproto-dpif.at:6377: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6377"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6377"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6378: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6378"
+$as_echo "$at_srcdir/ofproto-dpif.at:6377: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6377"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6377"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -152892,49 +153375,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6378: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6377: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6378"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6377"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6377"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6378: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6378"
+$as_echo "$at_srcdir/ofproto-dpif.at:6377: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6377"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6377"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6378: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6378"
+$as_echo "$at_srcdir/ofproto-dpif.at:6377: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6377"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6377"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -152946,14 +153429,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6378: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6377: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6378"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6377"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -152961,12 +153444,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6377"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152975,15 +153458,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6378: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6378"
+$as_echo "$at_srcdir/ofproto-dpif.at:6377: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6377"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6378"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6377"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -152998,92 +153481,92 @@
  done
  echo "in_port=65, actions=local") > flows
  { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6385: ovs-ofctl add-flows br0 flows"
-at_fn_check_prepare_trace "ofproto-dpif.at:6385"
+$as_echo "$at_srcdir/ofproto-dpif.at:6384: ovs-ofctl add-flows br0 flows"
+at_fn_check_prepare_trace "ofproto-dpif.at:6384"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6385"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6384"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6386: ovs-appctl -vpoll_loop:off ofproto/trace br0 'in_port=1'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6386"
+$as_echo "$at_srcdir/ofproto-dpif.at:6385: ovs-appctl -vpoll_loop:off ofproto/trace br0 'in_port=1'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6385"
 ( $at_check_trace; ovs-appctl -vpoll_loop:off ofproto/trace br0 'in_port=1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6386"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6385"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6387: grep -c 'over 4096 resubmit actions' ovs-vswitchd.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6387"
+$as_echo "$at_srcdir/ofproto-dpif.at:6386: grep -c 'over 4096 resubmit actions' ovs-vswitchd.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6386"
 ( $at_check_trace; grep -c 'over 4096 resubmit actions' ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6387"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6386"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6389: check_logs \"/over.*resubmit actions/d\""
-at_fn_check_prepare_trace "ofproto-dpif.at:6389"
+$as_echo "$at_srcdir/ofproto-dpif.at:6388: check_logs \"/over.*resubmit actions/d\""
+at_fn_check_prepare_trace "ofproto-dpif.at:6388"
 ( $at_check_trace; check_logs "/over.*resubmit actions/d"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6389"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6388"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6389: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6389"
+$as_echo "$at_srcdir/ofproto-dpif.at:6388: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6388"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6389"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6388"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6389: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6389"
+$as_echo "$at_srcdir/ofproto-dpif.at:6388: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6388"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6389"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6388"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -153093,13 +153576,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_913
-#AT_START_914
-at_fn_group_banner 914 'ofproto-dpif.at:6392' \
+#AT_STOP_915
+#AT_START_916
+at_fn_group_banner 916 'ofproto-dpif.at:6391' \
   "ofproto-dpif - too many output actions" "         " 54
 at_xfail=no
 (
-  $as_echo "914. $at_setup_line: testing $at_desc ..."
+  $as_echo "916. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -153109,29 +153592,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6393: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6393"
+$as_echo "$at_srcdir/ofproto-dpif.at:6392: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6392"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6393"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6392"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6393: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6393"
+$as_echo "$at_srcdir/ofproto-dpif.at:6392: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6392"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6393"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6392"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -153141,49 +153624,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6393: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6392: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6393"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6392"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6393"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6392"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6393: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6393"
+$as_echo "$at_srcdir/ofproto-dpif.at:6392: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6392"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6393"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6392"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6393: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6393"
+$as_echo "$at_srcdir/ofproto-dpif.at:6392: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6392"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6393"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6392"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -153195,14 +153678,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6393: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6392: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6393"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6392"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -153210,12 +153693,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6393"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6392"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -153224,15 +153707,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6393: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6393"
+$as_echo "$at_srcdir/ofproto-dpif.at:6392: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6392"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6393"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6392"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -153247,109 +153730,109 @@
  done
  echo "in_port=13, actions=local,local,local,local,local,local,local,local") > flows
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6400: ovs-ofctl add-flows br0 flows"
-at_fn_check_prepare_trace "ofproto-dpif.at:6400"
+$as_echo "$at_srcdir/ofproto-dpif.at:6399: ovs-ofctl add-flows br0 flows"
+at_fn_check_prepare_trace "ofproto-dpif.at:6399"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6400"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6399"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6401: ovs-appctl -vpoll_loop:off ofproto/trace br0 'in_port=1'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6401"
+$as_echo "$at_srcdir/ofproto-dpif.at:6400: ovs-appctl -vpoll_loop:off ofproto/trace br0 'in_port=1'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6400"
 ( $at_check_trace; ovs-appctl -vpoll_loop:off ofproto/trace br0 'in_port=1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6401"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6400"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6402: grep -c -e '- Uses action(s) not supported by datapath' stdout"
-at_fn_check_prepare_trace "ofproto-dpif.at:6402"
+$as_echo "$at_srcdir/ofproto-dpif.at:6401: grep -c -e '- Uses action(s) not supported by datapath' stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:6401"
 ( $at_check_trace; grep -c -e '- Uses action(s) not supported by datapath' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6402"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6401"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6405: grep -c 'resubmits yielded over 64 kB of actions' ovs-vswitchd.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6405"
+$as_echo "$at_srcdir/ofproto-dpif.at:6404: grep -c 'resubmits yielded over 64 kB of actions' ovs-vswitchd.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6404"
 ( $at_check_trace; grep -c 'resubmits yielded over 64 kB of actions' ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6405"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6404"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6407: check_logs \"/resubmits yielded over 64 kB of actions/d\""
-at_fn_check_prepare_trace "ofproto-dpif.at:6407"
+$as_echo "$at_srcdir/ofproto-dpif.at:6406: check_logs \"/resubmits yielded over 64 kB of actions/d\""
+at_fn_check_prepare_trace "ofproto-dpif.at:6406"
 ( $at_check_trace; check_logs "/resubmits yielded over 64 kB of actions/d"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6406"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6407: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6407"
+$as_echo "$at_srcdir/ofproto-dpif.at:6406: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6406"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6406"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6407: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6407"
+$as_echo "$at_srcdir/ofproto-dpif.at:6406: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6406"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6407"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6406"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -153359,13 +153842,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_914
-#AT_START_915
-at_fn_group_banner 915 'ofproto-dpif.at:6410' \
+#AT_STOP_916
+#AT_START_917
+at_fn_group_banner 917 'ofproto-dpif.at:6409' \
   "ofproto-dpif - stack too deep" "                  " 54
 at_xfail=no
 (
-  $as_echo "915. $at_setup_line: testing $at_desc ..."
+  $as_echo "917. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -153375,29 +153858,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6411: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6411"
+$as_echo "$at_srcdir/ofproto-dpif.at:6410: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6410"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6411"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6410"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6411: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6411"
+$as_echo "$at_srcdir/ofproto-dpif.at:6410: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6410"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6411"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6410"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -153407,49 +153890,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6411: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6410: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6411"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6410"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6411"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6410"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6411: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6411"
+$as_echo "$at_srcdir/ofproto-dpif.at:6410: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6410"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6411"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6410"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6411: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6411"
+$as_echo "$at_srcdir/ofproto-dpif.at:6410: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6410"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6411"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6410"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -153461,14 +153944,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6411: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6410: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6411"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6410"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -153476,12 +153959,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6411"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6410"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -153490,15 +153973,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6411: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6411"
+$as_echo "$at_srcdir/ofproto-dpif.at:6410: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6410"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6411"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6410"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -153514,92 +153997,92 @@
  push="push:NXM_NX_REG0[]"
  echo "in_port=13, actions=$push,$push,$push,$push,$push,$push,$push,$push") > flows
  { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6419: ovs-ofctl add-flows br0 flows"
-at_fn_check_prepare_trace "ofproto-dpif.at:6419"
+$as_echo "$at_srcdir/ofproto-dpif.at:6418: ovs-ofctl add-flows br0 flows"
+at_fn_check_prepare_trace "ofproto-dpif.at:6418"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6419"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6418"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6420: ovs-appctl -vpoll_loop:off ofproto/trace br0 'in_port=1'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6420"
+$as_echo "$at_srcdir/ofproto-dpif.at:6419: ovs-appctl -vpoll_loop:off ofproto/trace br0 'in_port=1'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6419"
 ( $at_check_trace; ovs-appctl -vpoll_loop:off ofproto/trace br0 'in_port=1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6420"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6419"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6421: grep -c 'resubmits yielded over 64 kB of stack' ovs-vswitchd.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6421"
+$as_echo "$at_srcdir/ofproto-dpif.at:6420: grep -c 'resubmits yielded over 64 kB of stack' ovs-vswitchd.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6420"
 ( $at_check_trace; grep -c 'resubmits yielded over 64 kB of stack' ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6421"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6420"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6423: check_logs \"/resubmits yielded over 64 kB of stack/d\""
-at_fn_check_prepare_trace "ofproto-dpif.at:6423"
+$as_echo "$at_srcdir/ofproto-dpif.at:6422: check_logs \"/resubmits yielded over 64 kB of stack/d\""
+at_fn_check_prepare_trace "ofproto-dpif.at:6422"
 ( $at_check_trace; check_logs "/resubmits yielded over 64 kB of stack/d"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6423"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6422"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6423: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6423"
+$as_echo "$at_srcdir/ofproto-dpif.at:6422: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6422"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6423"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6422"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6423: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6423"
+$as_echo "$at_srcdir/ofproto-dpif.at:6422: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6422"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6423"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6422"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -153609,13 +154092,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_915
-#AT_START_916
-at_fn_group_banner 916 'ofproto-dpif.at:6427' \
+#AT_STOP_917
+#AT_START_918
+at_fn_group_banner 918 'ofproto-dpif.at:6426' \
   "ofproto-dpif packet-out controller" "             " 54
 at_xfail=no
 (
-  $as_echo "916. $at_setup_line: testing $at_desc ..."
+  $as_echo "918. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -153625,29 +154108,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6428: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6428"
+$as_echo "$at_srcdir/ofproto-dpif.at:6427: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6427"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6428"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6427"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6428: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6428"
+$as_echo "$at_srcdir/ofproto-dpif.at:6427: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6427"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6428"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6427"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -153657,49 +154140,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6428: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6427: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6428"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6427"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6428"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6427"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6428: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6428"
+$as_echo "$at_srcdir/ofproto-dpif.at:6427: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6427"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6428"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6428: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6428"
+$as_echo "$at_srcdir/ofproto-dpif.at:6427: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6427"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6428"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -153711,14 +154194,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6428: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6427: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6428"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6427"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -153726,12 +154209,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6428"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -153740,15 +154223,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6428: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6428"
+$as_echo "$at_srcdir/ofproto-dpif.at:6427: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6427"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6428"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -153760,15 +154243,15 @@
     -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6431: ovs-ofctl add-flow br0 'dl_dst=50:54:00:00:00:0a actions=controller'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6431"
+$as_echo "$at_srcdir/ofproto-dpif.at:6430: ovs-ofctl add-flow br0 'dl_dst=50:54:00:00:00:0a actions=controller'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6430"
 ( $at_check_trace; ovs-ofctl add-flow br0 'dl_dst=50:54:00:00:00:0a actions=controller'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6431"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6430"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -153777,15 +154260,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6434: ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6434"
+$as_echo "$at_srcdir/ofproto-dpif.at:6433: ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6433"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6434"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6433"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -153795,15 +154278,15 @@
 
 for i in 1 2 3; do
 	{ set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6437: ovs-ofctl -O OpenFlow13 packet-out br0 CONTROLLER controller '50540000000a5054000000091234'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6437"
+$as_echo "$at_srcdir/ofproto-dpif.at:6436: ovs-ofctl -O OpenFlow13 packet-out br0 CONTROLLER controller '50540000000a5054000000091234'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6436"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 packet-out br0 CONTROLLER controller '50540000000a5054000000091234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6437"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6436"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -153813,19 +154296,19 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6440: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:6439: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6440"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6439"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6440"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6439"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -153833,10 +154316,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6441: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6441"
+$as_echo "$at_srcdir/ofproto-dpif.at:6440: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6440"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -153848,7 +154331,7 @@
 vlan_tci=0x0000,dl_src=50:54:00:00:00:09,dl_dst=50:54:00:00:00:0a,dl_type=0x1234
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6441"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6440"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -153857,10 +154340,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6452: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6452"
+$as_echo "$at_srcdir/ofproto-dpif.at:6451: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6451"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -153868,7 +154351,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6452"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6451"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -153887,15 +154370,15 @@
    x=`expr $x + 1`
  done) > expout
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6467: ovs-ofctl -O OpenFlow13 dump-tables br0 "
-at_fn_check_prepare_trace "ofproto-dpif.at:6467"
+$as_echo "$at_srcdir/ofproto-dpif.at:6466: ovs-ofctl -O OpenFlow13 dump-tables br0 "
+at_fn_check_prepare_trace "ofproto-dpif.at:6466"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 dump-tables br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6467"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6466"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -153904,15 +154387,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6469: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6469"
+$as_echo "$at_srcdir/ofproto-dpif.at:6468: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6468"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6469"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6468"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -153920,15 +154403,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6469: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6469"
+$as_echo "$at_srcdir/ofproto-dpif.at:6468: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6468"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6469"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6468"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -153936,15 +154419,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6469: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6469"
+$as_echo "$at_srcdir/ofproto-dpif.at:6468: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6468"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6469"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6468"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -153955,13 +154438,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_916
-#AT_START_917
-at_fn_group_banner 917 'ofproto-dpif.at:6472' \
+#AT_STOP_918
+#AT_START_919
+at_fn_group_banner 919 'ofproto-dpif.at:6471' \
   "ofproto-dpif packet-out controller (patch port)" "" 54
 at_xfail=no
 (
-  $as_echo "917. $at_setup_line: testing $at_desc ..."
+  $as_echo "919. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -153971,29 +154454,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6473: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6473"
+$as_echo "$at_srcdir/ofproto-dpif.at:6472: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6472"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6472"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6473: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6473"
+$as_echo "$at_srcdir/ofproto-dpif.at:6472: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6472"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6472"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -154003,49 +154486,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6473: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6472: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6473"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6472"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6472"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6473: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6473"
+$as_echo "$at_srcdir/ofproto-dpif.at:6472: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6472"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6472"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6473: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6473"
+$as_echo "$at_srcdir/ofproto-dpif.at:6472: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6472"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6472"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -154057,14 +154540,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6473: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6472: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6473"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6472"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -154072,12 +154555,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6472"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -154086,7 +154569,7 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6473: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- -- \\
+$as_echo "$at_srcdir/ofproto-dpif.at:6472: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- -- \\
    add-port br0 p1 -- \\
    set interface p1 type=patch options:peer=p2 -- \\
    add-br br1 -- \\
@@ -154095,7 +154578,7 @@
    set bridge br1 protocols='OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13' -- \\
    add-port br1 p2 -- \\
    set interface p2 type=patch options:peer=p1 -- "
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6473"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6472"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- -- \
    add-port br0 p1 -- \
    set interface p1 type=patch options:peer=p2 -- \
@@ -154105,12 +154588,12 @@
    set bridge br1 protocols='OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13' -- \
    add-port br1 p2 -- \
    set interface p2 type=patch options:peer=p1 --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6473"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6472"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -154120,15 +154603,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6485: ovs-ofctl monitor br1 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6485"
+$as_echo "$at_srcdir/ofproto-dpif.at:6484: ovs-ofctl monitor br1 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6484"
 ( $at_check_trace; ovs-ofctl monitor br1 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6485"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6484"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154138,15 +154621,15 @@
 
 for i in 1 2 3; do
 	{ set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6488: ovs-ofctl -O OpenFlow13 packet-out br0 CONTROLLER output:1 '50540000000a5054000000091234'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6488"
+$as_echo "$at_srcdir/ofproto-dpif.at:6487: ovs-ofctl -O OpenFlow13 packet-out br0 CONTROLLER output:1 '50540000000a5054000000091234'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6487"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 packet-out br0 CONTROLLER output:1 '50540000000a5054000000091234'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6488"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6487"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154156,19 +154639,19 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6491: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:6490: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6491"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6490"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6491"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6490"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154176,10 +154659,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6492: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6492"
+$as_echo "$at_srcdir/ofproto-dpif.at:6491: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6491"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -154191,7 +154674,7 @@
 vlan_tci=0x0000,dl_src=50:54:00:00:00:09,dl_dst=50:54:00:00:00:0a,dl_type=0x1234
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6492"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6491"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154208,15 +154691,15 @@
    x=`expr $x + 1`
  done) > expout
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6511: ovs-ofctl -O OpenFlow13 dump-tables br0 "
-at_fn_check_prepare_trace "ofproto-dpif.at:6511"
+$as_echo "$at_srcdir/ofproto-dpif.at:6510: ovs-ofctl -O OpenFlow13 dump-tables br0 "
+at_fn_check_prepare_trace "ofproto-dpif.at:6510"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 dump-tables br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6511"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6510"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154235,15 +154718,15 @@
    x=`expr $x + 1`
  done) > expout
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6523: ovs-ofctl -O OpenFlow13 dump-tables br1 "
-at_fn_check_prepare_trace "ofproto-dpif.at:6523"
+$as_echo "$at_srcdir/ofproto-dpif.at:6522: ovs-ofctl -O OpenFlow13 dump-tables br1 "
+at_fn_check_prepare_trace "ofproto-dpif.at:6522"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 dump-tables br1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6523"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6522"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154252,15 +154735,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6525: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6525"
+$as_echo "$at_srcdir/ofproto-dpif.at:6524: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6524"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6525"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6524"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154268,15 +154751,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6525: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6525"
+$as_echo "$at_srcdir/ofproto-dpif.at:6524: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6524"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6525"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6524"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154284,15 +154767,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6525: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6525"
+$as_echo "$at_srcdir/ofproto-dpif.at:6524: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6524"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6525"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6524"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154303,13 +154786,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_917
-#AT_START_918
-at_fn_group_banner 918 'ofproto-dpif.at:6529' \
+#AT_STOP_919
+#AT_START_920
+at_fn_group_banner 920 'ofproto-dpif.at:6528' \
   "ofproto-dpif packet-out goto_table" "             " 54
 at_xfail=no
 (
-  $as_echo "918. $at_setup_line: testing $at_desc ..."
+  $as_echo "920. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -154319,29 +154802,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6530: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6530"
+$as_echo "$at_srcdir/ofproto-dpif.at:6529: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6529"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6530"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6529"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6530: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6530"
+$as_echo "$at_srcdir/ofproto-dpif.at:6529: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6529"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6530"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6529"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -154351,49 +154834,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6530: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6529: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6530"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6529"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6530"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6529"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6530: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6530"
+$as_echo "$at_srcdir/ofproto-dpif.at:6529: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6529"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6530"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6529"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6530: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6530"
+$as_echo "$at_srcdir/ofproto-dpif.at:6529: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6529"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6530"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6529"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -154405,14 +154888,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6530: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6529: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6530"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6529"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -154420,12 +154903,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6530"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6529"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -154434,15 +154917,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6530: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6530"
+$as_echo "$at_srcdir/ofproto-dpif.at:6529: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6529"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6530"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6529"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -154459,15 +154942,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6537: ovs-ofctl -O OpenFlow13 add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ofproto-dpif.at:6537"
+$as_echo "$at_srcdir/ofproto-dpif.at:6536: ovs-ofctl -O OpenFlow13 add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ofproto-dpif.at:6536"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 add-flows br0 flows.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6537"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6536"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -154476,15 +154959,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6540: ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6540"
+$as_echo "$at_srcdir/ofproto-dpif.at:6539: ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6539"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6540"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6539"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154497,19 +154980,19 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6546: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:6545: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:6546"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:6545"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6546"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6545"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154517,19 +155000,19 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6547: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:6546: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6547"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6546"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6547"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6546"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154537,10 +155020,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6548: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6548"
+$as_echo "$at_srcdir/ofproto-dpif.at:6547: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6547"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -154552,7 +155035,7 @@
 vlan_tci=0x0000,dl_src=50:54:00:00:00:09,dl_dst=50:54:00:00:00:0a,dl_type=0x1234
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6548"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6547"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154561,15 +155044,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6559: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:6559"
+$as_echo "$at_srcdir/ofproto-dpif.at:6558: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:6558"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6559"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6558"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154577,10 +155060,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6560: ovs-ofctl -O OpenFlow13 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6560"
+$as_echo "$at_srcdir/ofproto-dpif.at:6559: ovs-ofctl -O OpenFlow13 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6559"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -154589,7 +155072,7 @@
 OFPST_FLOW reply (OF1.3):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6560"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6559"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154611,15 +155094,15 @@
    x=`expr $x + 1`
  done) > expout
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6579: ovs-ofctl -O OpenFlow13 dump-tables br0 "
-at_fn_check_prepare_trace "ofproto-dpif.at:6579"
+$as_echo "$at_srcdir/ofproto-dpif.at:6578: ovs-ofctl -O OpenFlow13 dump-tables br0 "
+at_fn_check_prepare_trace "ofproto-dpif.at:6578"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 dump-tables br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6579"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6578"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154628,15 +155111,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6581: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6581"
+$as_echo "$at_srcdir/ofproto-dpif.at:6580: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6580"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6581"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6580"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154644,15 +155127,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6581: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6581"
+$as_echo "$at_srcdir/ofproto-dpif.at:6580: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6580"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6581"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6580"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154660,15 +155143,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6581: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6581"
+$as_echo "$at_srcdir/ofproto-dpif.at:6580: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6580"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6581"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6580"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154679,13 +155162,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_918
-#AT_START_919
-at_fn_group_banner 919 'ofproto-dpif.at:6585' \
+#AT_STOP_920
+#AT_START_921
+at_fn_group_banner 921 'ofproto-dpif.at:6584' \
   "ofproto-dpif packet-out table-miss (continue)" "  " 54
 at_xfail=no
 (
-  $as_echo "919. $at_setup_line: testing $at_desc ..."
+  $as_echo "921. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -154695,29 +155178,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6586: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6586"
+$as_echo "$at_srcdir/ofproto-dpif.at:6585: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6585"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6586"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6585"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6586: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6586"
+$as_echo "$at_srcdir/ofproto-dpif.at:6585: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6585"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6586"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6585"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -154727,49 +155210,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6586: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6585: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6586"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6585"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6586"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6585"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6586: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6586"
+$as_echo "$at_srcdir/ofproto-dpif.at:6585: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6585"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6586"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6585"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6586: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6586"
+$as_echo "$at_srcdir/ofproto-dpif.at:6585: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6585"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6586"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6585"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -154781,14 +155264,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6586: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6585: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6586"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6585"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -154796,12 +155279,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6586"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6585"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -154810,15 +155293,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6586: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6586"
+$as_echo "$at_srcdir/ofproto-dpif.at:6585: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6585"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6586"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6585"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -154830,30 +155313,30 @@
     -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6589: ovs-ofctl -O OpenFlow11 add-flow br0 'table=1 dl_dst=50:54:00:00:00:0a actions=controller'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6589"
+$as_echo "$at_srcdir/ofproto-dpif.at:6588: ovs-ofctl -O OpenFlow11 add-flow br0 'table=1 dl_dst=50:54:00:00:00:0a actions=controller'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6588"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 'table=1 dl_dst=50:54:00:00:00:0a actions=controller'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6589"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6588"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6590: ovs-ofctl -O OpenFlow11 mod-table br0 all continue"
-at_fn_check_prepare_trace "ofproto-dpif.at:6590"
+$as_echo "$at_srcdir/ofproto-dpif.at:6589: ovs-ofctl -O OpenFlow11 mod-table br0 all continue"
+at_fn_check_prepare_trace "ofproto-dpif.at:6589"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 mod-table br0 all continue
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6590"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6589"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -154862,15 +155345,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6593: ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6593"
+$as_echo "$at_srcdir/ofproto-dpif.at:6592: ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6592"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6593"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6592"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154883,19 +155366,19 @@
 done
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6599: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
+$as_echo "$at_srcdir/ofproto-dpif.at:6598: ovs_wait_cond () { test \`wc -l < ofctl_monitor.log\` -ge 6
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:6599"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ofproto-dpif.at:6598"
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < ofctl_monitor.log` -ge 6
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6599"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6598"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154903,19 +155386,19 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6600: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:6599: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6600"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6599"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6600"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6599"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154923,10 +155406,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6601: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6601"
+$as_echo "$at_srcdir/ofproto-dpif.at:6600: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6600"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -154938,7 +155421,7 @@
 vlan_tci=0x0000,dl_src=50:54:00:00:00:09,dl_dst=50:54:00:00:00:0a,dl_type=0x1234
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6601"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6600"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154947,15 +155430,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6612: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "ofproto-dpif.at:6612"
+$as_echo "$at_srcdir/ofproto-dpif.at:6611: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "ofproto-dpif.at:6611"
 ( $at_check_trace; ovs-appctl revalidator/purge
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6612"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6611"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154963,10 +155446,10 @@
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6613: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6613"
+$as_echo "$at_srcdir/ofproto-dpif.at:6612: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofproto-dpif.at:6612"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -154974,7 +155457,7 @@
 OFPST_FLOW reply (OF1.1):
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6613"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6612"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -154996,15 +155479,15 @@
    x=`expr $x + 1`
  done) > expout
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6631: ovs-ofctl -O OpenFlow13 dump-tables br0 "
-at_fn_check_prepare_trace "ofproto-dpif.at:6631"
+$as_echo "$at_srcdir/ofproto-dpif.at:6630: ovs-ofctl -O OpenFlow13 dump-tables br0 "
+at_fn_check_prepare_trace "ofproto-dpif.at:6630"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 dump-tables br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6631"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6630"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155013,15 +155496,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6633: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6633"
+$as_echo "$at_srcdir/ofproto-dpif.at:6632: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6632"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6633"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6632"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155029,15 +155512,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6633: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6633"
+$as_echo "$at_srcdir/ofproto-dpif.at:6632: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6632"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6633"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6632"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155045,15 +155528,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6633: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6633"
+$as_echo "$at_srcdir/ofproto-dpif.at:6632: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6632"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6633"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6632"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155064,13 +155547,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_919
-#AT_START_920
-at_fn_group_banner 920 'ofproto-dpif.at:6636' \
+#AT_STOP_921
+#AT_START_922
+at_fn_group_banner 922 'ofproto-dpif.at:6635' \
   "ofproto-dpif - ICMPv6" "                          " 54
 at_xfail=no
 (
-  $as_echo "920. $at_setup_line: testing $at_desc ..."
+  $as_echo "922. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -155080,29 +155563,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6637: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6637"
+$as_echo "$at_srcdir/ofproto-dpif.at:6636: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6636"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6636"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6637: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6637"
+$as_echo "$at_srcdir/ofproto-dpif.at:6636: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6636"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6636"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -155112,49 +155595,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6637: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6636: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6637"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6636"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6636"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6637: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6637"
+$as_echo "$at_srcdir/ofproto-dpif.at:6636: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6636"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6636"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6637: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6637"
+$as_echo "$at_srcdir/ofproto-dpif.at:6636: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6636"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6636"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -155166,14 +155649,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6637: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6636: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6637"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6636"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -155181,12 +155664,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6636"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -155195,15 +155678,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6637: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6637"
+$as_echo "$at_srcdir/ofproto-dpif.at:6636: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6636"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6637"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6636"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -155216,15 +155699,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6642: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6642"
+$as_echo "$at_srcdir/ofproto-dpif.at:6641: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6641"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6642"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6641"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155235,19 +155718,19 @@
 ovs-appctl netdev-dummy/receive p1 '0060970769ea0000860580da86dd6000000000203afffe80000000000000020086fffe0580dafe80000000000000026097fffe0769ea870068bd00000000fe80000000000000026097fffe0769ea01010000860580da'
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6646: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:6645: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6646"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6645"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6646"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6645"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155256,10 +155739,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6648: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6648"
+$as_echo "$at_srcdir/ofproto-dpif.at:6647: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6647"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -155267,7 +155750,7 @@
 icmp6,vlan_tci=0x0000,dl_src=00:00:86:05:80:da,dl_dst=00:60:97:07:69:ea,ipv6_src=fe80::200:86ff:fe05:80da,ipv6_dst=fe80::260:97ff:fe07:69ea,ipv6_label=0x00000,nw_tos=0,nw_ecn=0,nw_ttl=255,icmp_type=135,icmp_code=0,nd_target=fe80::260:97ff:fe07:69ea,nd_sll=00:00:86:05:80:da,nd_tll=00:00:00:00:00:00 icmp6_csum:68bd
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6648"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6647"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155276,15 +155759,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6653: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6653"
+$as_echo "$at_srcdir/ofproto-dpif.at:6652: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6652"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6653"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6652"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155292,15 +155775,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6653: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6653"
+$as_echo "$at_srcdir/ofproto-dpif.at:6652: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6652"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6653"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6652"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155308,15 +155791,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6653: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6653"
+$as_echo "$at_srcdir/ofproto-dpif.at:6652: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6652"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6653"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6652"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155327,13 +155810,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_920
-#AT_START_921
-at_fn_group_banner 921 'ofproto-dpif.at:6656' \
+#AT_STOP_922
+#AT_START_923
+at_fn_group_banner 923 'ofproto-dpif.at:6655' \
   "ofproto-dpif - Neighbor Discovery set-field with checksum update" "" 54
 at_xfail=no
 (
-  $as_echo "921. $at_setup_line: testing $at_desc ..."
+  $as_echo "923. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -155343,29 +155826,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6657: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6657"
+$as_echo "$at_srcdir/ofproto-dpif.at:6656: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6656"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6657"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6656"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6657: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6657"
+$as_echo "$at_srcdir/ofproto-dpif.at:6656: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6656"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6657"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6656"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -155375,49 +155858,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6657: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6656: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6657"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6656"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6657"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6656"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6657: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6657"
+$as_echo "$at_srcdir/ofproto-dpif.at:6656: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6656"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6657"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6656"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6657: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6657"
+$as_echo "$at_srcdir/ofproto-dpif.at:6656: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6656"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6657"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6656"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -155429,14 +155912,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6657: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6656: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6657"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6656"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -155444,12 +155927,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6657"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6656"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -155458,15 +155941,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6657: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
-at_fn_check_prepare_trace "ofproto-dpif.at:6657"
+$as_echo "$at_srcdir/ofproto-dpif.at:6656: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6656"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6657"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6656"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -155476,15 +155959,15 @@
 ovs-vsctl  \
     -- add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6659: ovs-ofctl add-flow br0 icmp6,icmpv6_type=135,action=set_field:fe80::1-\\>nd_target,set_field:32:21:14:86:11:74-\\>nd_sll,output:controller"
-at_fn_check_prepare_trace "ofproto-dpif.at:6659"
+$as_echo "$at_srcdir/ofproto-dpif.at:6658: ovs-ofctl add-flow br0 icmp6,icmpv6_type=135,action=set_field:fe80::1-\\>nd_target,set_field:32:21:14:86:11:74-\\>nd_sll,output:controller"
+at_fn_check_prepare_trace "ofproto-dpif.at:6658"
 ( $at_check_trace; ovs-ofctl add-flow br0 icmp6,icmpv6_type=135,action=set_field:fe80::1-\>nd_target,set_field:32:21:14:86:11:74-\>nd_sll,output:controller
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6659"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6658"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -155494,15 +155977,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6663: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6663"
+$as_echo "$at_srcdir/ofproto-dpif.at:6662: ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6662"
 ( $at_check_trace; ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6663"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6662"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155513,19 +155996,19 @@
 ovs-appctl netdev-dummy/receive p1 '0060970769ea0000860580da86dd6000000000203afffe80000000000000020086fffe0580dafe80000000000000026097fffe0769ea870068bd00000000fe80000000000000026097fffe0769ea01010000860580da'
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6667: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
+$as_echo "$at_srcdir/ofproto-dpif.at:6666: ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6667"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6666"
 ( $at_check_trace; ovs_wait_cond () { ovs-appctl -t ovs-ofctl exit
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6667"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6666"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155534,10 +156017,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6669: cat ofctl_monitor.log"
-at_fn_check_prepare_trace "ofproto-dpif.at:6669"
+$as_echo "$at_srcdir/ofproto-dpif.at:6668: cat ofctl_monitor.log"
+at_fn_check_prepare_trace "ofproto-dpif.at:6668"
 ( $at_check_trace; cat ofctl_monitor.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -155545,7 +156028,7 @@
 icmp6,vlan_tci=0x0000,dl_src=00:00:86:05:80:da,dl_dst=00:60:97:07:69:ea,ipv6_src=fe80::200:86ff:fe05:80da,ipv6_dst=fe80::260:97ff:fe07:69ea,ipv6_label=0x00000,nw_tos=0,nw_ecn=0,nw_ttl=255,icmp_type=135,icmp_code=0,nd_target=fe80::1,nd_sll=32:21:14:86:11:74,nd_tll=00:00:00:00:00:00 icmp6_csum:19d3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6669"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6668"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155554,15 +156037,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6674: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6674"
+$as_echo "$at_srcdir/ofproto-dpif.at:6673: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6673"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6674"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6673"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155570,15 +156053,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6674: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6674"
+$as_echo "$at_srcdir/ofproto-dpif.at:6673: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6673"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6674"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6673"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155586,15 +156069,15 @@
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6674: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6674"
+$as_echo "$at_srcdir/ofproto-dpif.at:6673: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6673"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6674"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6673"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log" \
@@ -155605,13 +156088,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_921
-#AT_START_922
-at_fn_group_banner 922 'ofproto-dpif.at:6678' \
+#AT_STOP_923
+#AT_START_924
+at_fn_group_banner 924 'ofproto-dpif.at:6677' \
   "ofproto-dpif - vlan matching" "                   " 54
 at_xfail=no
 (
-  $as_echo "922. $at_setup_line: testing $at_desc ..."
+  $as_echo "924. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -155621,29 +156104,29 @@
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6679: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6679"
+$as_echo "$at_srcdir/ofproto-dpif.at:6678: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6678"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6679"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6678"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6679: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6679"
+$as_echo "$at_srcdir/ofproto-dpif.at:6678: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6678"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6679"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6678"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -155653,49 +156136,49 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6679: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6678: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6679"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6678"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6679"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6678"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6679: ovs-vsctl --no-wait init"
-at_fn_check_prepare_trace "ofproto-dpif.at:6679"
+$as_echo "$at_srcdir/ofproto-dpif.at:6678: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6678"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6679"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6678"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6679: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
-at_fn_check_prepare_trace "ofproto-dpif.at:6679"
+$as_echo "$at_srcdir/ofproto-dpif.at:6678: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6678"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6679"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6678"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -155707,14 +156190,14 @@
 mv __cleanup cleanup
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6679: sed < stderr '
+$as_echo "$at_srcdir/ofproto-dpif.at:6678: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6679"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6678"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -155722,12 +156205,12 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6679"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6678"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -155736,15 +156219,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6679: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 "
-at_fn_check_prepare_trace "ofproto-dpif.at:6679"
+$as_echo "$at_srcdir/ofproto-dpif.at:6678: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 "
+at_fn_check_prepare_trace "ofproto-dpif.at:6678"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6679"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6678"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -155752,15 +156235,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6681: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
-at_fn_check_prepare_trace "ofproto-dpif.at:6681"
+$as_echo "$at_srcdir/ofproto-dpif.at:6680: ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg"
+at_fn_check_prepare_trace "ofproto-dpif.at:6680"
 ( $at_check_trace; ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6681"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6680"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -155768,30 +156251,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6683: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "ofproto-dpif.at:6683"
+$as_echo "$at_srcdir/ofproto-dpif.at:6682: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "ofproto-dpif.at:6682"
 ( $at_check_trace; ovs-ofctl del-flows br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6683"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6682"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6684: ovs-ofctl add-flow br0 \"vlan_tci=0x000a/0x0fff,action=output:local\""
-at_fn_check_prepare_trace "ofproto-dpif.at:6684"
+$as_echo "$at_srcdir/ofproto-dpif.at:6683: ovs-ofctl add-flow br0 \"vlan_tci=0x000a/0x0fff,action=output:local\""
+at_fn_check_prepare_trace "ofproto-dpif.at:6683"
 ( $at_check_trace; ovs-ofctl add-flow br0 "vlan_tci=0x000a/0x0fff,action=output:local"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6684"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6683"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -155799,15 +156282,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6686: ovs-appctl netdev-dummy/receive p0 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x8100),vlan(vid=10,pcp=0),encap(eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0))'"
-at_fn_check_prepare_trace "ofproto-dpif.at:6686"
+$as_echo "$at_srcdir/ofproto-dpif.at:6685: ovs-appctl netdev-dummy/receive p0 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x8100),vlan(vid=10,pcp=0),encap(eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0))'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6685"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p0 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x8100),vlan(vid=10,pcp=0),encap(eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0))'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6686"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6685"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -155815,7 +156298,7 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6688: cat ovs-vswitchd.log | grep 'in_port=[1]' |
+$as_echo "$at_srcdir/ofproto-dpif.at:6687: cat ovs-vswitchd.log | grep 'in_port=[1]' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
 ' | sort | uniq | sed '
@@ -155825,7 +156308,7 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort"
-at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6688"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6687"
 ( $at_check_trace; cat ovs-vswitchd.log | grep 'in_port=[1]' |
 grep 'flow_add' | sed '
     s/.*flow_add: //
@@ -155836,59 +156319,59 @@
     s/packets:[0-9]*/packets:0/
     s/bytes:[0-9]*/bytes:0/
 ' | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "recirc_id=0,ip,in_port=1,dl_vlan=10,nw_frag=no, actions: 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6688"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6687"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6691: check_logs "
-at_fn_check_prepare_trace "ofproto-dpif.at:6691"
+$as_echo "$at_srcdir/ofproto-dpif.at:6690: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6690"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6690"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6691: ovs-appctl -t ovs-vswitchd exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6691"
+$as_echo "$at_srcdir/ofproto-dpif.at:6690: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6690"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6690"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofproto-dpif.at:6691: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofproto-dpif.at:6691"
+$as_echo "$at_srcdir/ofproto-dpif.at:6690: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6690"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6691"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6690"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -155898,13 +156381,272 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_922
-#AT_START_923
-at_fn_group_banner 923 'bridge.at:7' \
+#AT_STOP_924
+#AT_START_925
+at_fn_group_banner 925 'ofproto-dpif.at:6693' \
+  "ofproto-dpif - trace (unchanged)" "               " 54
+at_xfail=no
+(
+  $as_echo "925. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+OVS_RUNDIR=`pwd`; export OVS_RUNDIR
+   OVS_LOGDIR=`pwd`; export OVS_LOGDIR
+   OVS_DBDIR=`pwd`; export OVS_DBDIR
+   OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR
+
+      touch .conf.db.~lock~
+   { set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6694: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofproto-dpif.at:6694"
+( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6694"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6694: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofproto-dpif.at:6694"
+( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6694"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+    trap '. ./cleanup' 0; cat - cleanup << EOF > __cleanup
+kill `cat ovsdb-server.pid`
+EOF
+mv __cleanup cleanup
+
+   { set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6694: sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6694"
+( $at_check_trace; sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6694"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+      { set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6694: ovs-vsctl --no-wait init"
+at_fn_check_prepare_trace "ofproto-dpif.at:6694"
+( $at_check_trace; ovs-vsctl --no-wait init
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6694"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6694: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
+at_fn_check_prepare_trace "ofproto-dpif.at:6694"
+( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6694"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+   trap '. ./cleanup' 0; cat - cleanup << EOF > __cleanup
+kill `cat ovs-vswitchd.pid`
+EOF
+mv __cleanup cleanup
+
+   { set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6694: sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/ofproto|INFO|using datapath ID/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "ofproto-dpif.at:6694"
+( $at_check_trace; sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/ofproto|INFO|using datapath ID/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6694"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+      { set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6694: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
+at_fn_check_prepare_trace "ofproto-dpif.at:6694"
+( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6694"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+{ set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6695: ovs-appctl ofproto/trace br0 'in_port=1'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6695"
+( $at_check_trace; ovs-appctl ofproto/trace br0 'in_port=1'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6695"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6696: grep \"Final flow:\" stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:6696"
+( $at_check_trace; grep "Final flow:" stdout
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "Final flow: unchanged
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6696"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6698: ovs-appctl ofproto/trace ovs-dummy 'in_port(100)'"
+at_fn_check_prepare_trace "ofproto-dpif.at:6698"
+( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(100)'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6698"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6699: grep \"Final flow:\" stdout"
+at_fn_check_prepare_trace "ofproto-dpif.at:6699"
+( $at_check_trace; grep "Final flow:" stdout
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "Final flow: unchanged
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6699"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6701: check_logs "
+at_fn_check_prepare_trace "ofproto-dpif.at:6701"
+( $at_check_trace; check_logs
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6701"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6701: ovs-appctl -t ovs-vswitchd exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6701"
+( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6701"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ofproto-dpif.at:6701: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofproto-dpif.at:6701"
+( $at_check_trace; ovs-appctl -t ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ofproto-dpif.at:6701"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_925
+#AT_START_926
+at_fn_group_banner 926 'bridge.at:7' \
   "bridge - ports that disappear get added back" "   " 55
 at_xfail=no
 (
-  $as_echo "923. $at_setup_line: testing $at_desc ..."
+  $as_echo "926. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -155917,7 +156659,7 @@
 $as_echo "$at_srcdir/bridge.at:8: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bridge.at:8"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -155931,7 +156673,7 @@
 $as_echo "$at_srcdir/bridge.at:8: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bridge.at:8"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -155953,7 +156695,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -155968,7 +156710,7 @@
 $as_echo "$at_srcdir/bridge.at:8: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "bridge.at:8"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -155983,7 +156725,7 @@
 $as_echo "$at_srcdir/bridge.at:8: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "bridge.at:8"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -156015,7 +156757,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156032,7 +156774,7 @@
 $as_echo "$at_srcdir/bridge.at:8: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "bridge.at:8"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156053,7 +156795,7 @@
 $as_echo "$at_srcdir/bridge.at:12: ovs-appctl dpif/show"
 at_fn_check_prepare_trace "bridge.at:12"
 ( $at_check_trace; ovs-appctl dpif/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156077,7 +156819,7 @@
 $as_echo "$at_srcdir/bridge.at:22: ovs-appctl dpif-dummy/delete-port ovs-dummy p1"
 at_fn_check_prepare_trace "bridge.at:22"
 ( $at_check_trace; ovs-appctl dpif-dummy/delete-port ovs-dummy p1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156092,7 +156834,7 @@
 $as_echo "$at_srcdir/bridge.at:23: ovs-appctl dpif/show"
 at_fn_check_prepare_trace "bridge.at:23"
 ( $at_check_trace; ovs-appctl dpif/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156114,7 +156856,7 @@
 $as_echo "$at_srcdir/bridge.at:31: ovs-vsctl del-port p2"
 at_fn_check_prepare_trace "bridge.at:31"
 ( $at_check_trace; ovs-vsctl del-port p2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156129,7 +156871,7 @@
 $as_echo "$at_srcdir/bridge.at:32: ovs-appctl dpif/show"
 at_fn_check_prepare_trace "bridge.at:32"
 ( $at_check_trace; ovs-appctl dpif/show
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156149,13 +156891,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_923
-#AT_START_924
-at_fn_group_banner 924 'vlan-splinters.at:3' \
+#AT_STOP_926
+#AT_START_927
+at_fn_group_banner 927 'vlan-splinters.at:3' \
   "VLAN splinters" "                                 " 56
 at_xfail=no
 (
-  $as_echo "924. $at_setup_line: testing $at_desc ..."
+  $as_echo "927. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "vlan-splinters.at:4" >"$at_check_line_file"
@@ -156171,7 +156913,7 @@
 $as_echo "$at_srcdir/vlan-splinters.at:5: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "vlan-splinters.at:5"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156185,7 +156927,7 @@
 $as_echo "$at_srcdir/vlan-splinters.at:5: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "vlan-splinters.at:5"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -156207,7 +156949,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156222,7 +156964,7 @@
 $as_echo "$at_srcdir/vlan-splinters.at:5: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "vlan-splinters.at:5"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156237,7 +156979,7 @@
 $as_echo "$at_srcdir/vlan-splinters.at:5: ovs-vswitchd --enable-dummy=override --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "vlan-splinters.at:5"
 ( $at_check_trace; ovs-vswitchd --enable-dummy=override --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -156269,7 +157011,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156286,7 +157028,7 @@
 $as_echo "$at_srcdir/vlan-splinters.at:5: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "vlan-splinters.at:5"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156321,7 +157063,7 @@
   -- set port p2 tag=9 \
   -- set port p3 tag=11 \
   -- set port p4 tag=15
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156352,7 +157094,7 @@
 $as_echo "$at_srcdir/vlan-splinters.at:31: ovs-appctl ofproto/trace ovs-dummy \"in_port(\$splinter_port)\""
 at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"in_port($splinter_port)\"" "vlan-splinters.at:31"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "in_port($splinter_port)"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156367,7 +157109,7 @@
 $as_echo "$at_srcdir/vlan-splinters.at:33: sed -n '/^Flow/p; /^Datapath/p' stdout"
 at_fn_check_prepare_trace "vlan-splinters.at:33"
 ( $at_check_trace; sed -n '/^Flow/p; /^Datapath/p' stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156388,7 +157130,7 @@
 $as_echo "$at_srcdir/vlan-splinters.at:40: ovs-appctl ofproto/trace ovs-dummy \"in_port(\$access_port)\""
 at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"in_port($access_port)\"" "vlan-splinters.at:40"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "in_port($access_port)"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156403,7 +157145,7 @@
 $as_echo "$at_srcdir/vlan-splinters.at:42: tail -1 stdout"
 at_fn_check_prepare_trace "vlan-splinters.at:42"
 ( $at_check_trace; tail -1 stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156422,7 +157164,7 @@
 $as_echo "$at_srcdir/vlan-splinters.at:46: check_logs "
 at_fn_check_prepare_trace "vlan-splinters.at:46"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156437,7 +157179,7 @@
 $as_echo "$at_srcdir/vlan-splinters.at:46: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "vlan-splinters.at:46"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156452,7 +157194,7 @@
 $as_echo "$at_srcdir/vlan-splinters.at:46: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "vlan-splinters.at:46"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156467,13 +157209,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_924
-#AT_START_925
-at_fn_group_banner 925 'ovsdb-log.at:3' \
+#AT_STOP_927
+#AT_START_928
+at_fn_group_banner 928 'ovsdb-log.at:3' \
   "create empty, reread" "                           " 57
 at_xfail=no
 (
-  $as_echo "925. $at_setup_line: testing $at_desc ..."
+  $as_echo "928. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -156482,7 +157224,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:6: test-ovsdb log-io file create"
 at_fn_check_prepare_trace "ovsdb-log.at:6"
 ( $at_check_trace; test-ovsdb log-io file create
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156498,7 +157240,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:10: test-ovsdb log-io file read-only read"
 at_fn_check_prepare_trace "ovsdb-log.at:10"
 ( $at_check_trace; test-ovsdb log-io file read-only read
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156515,7 +157257,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:15: test -f .file.~lock~"
 at_fn_check_prepare_trace "ovsdb-log.at:15"
 ( $at_check_trace; test -f .file.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156529,13 +157271,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_925
-#AT_START_926
-at_fn_group_banner 926 'ovsdb-log.at:18' \
+#AT_STOP_928
+#AT_START_929
+at_fn_group_banner 929 'ovsdb-log.at:18' \
   "write one, reread" "                              " 57
 at_xfail=no
 (
-  $as_echo "926. $at_setup_line: testing $at_desc ..."
+  $as_echo "929. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -156544,7 +157286,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:21: test-ovsdb log-io file create 'write:[0]'"
 at_fn_check_prepare_trace "ovsdb-log.at:21"
 ( $at_check_trace; test-ovsdb log-io file create 'write:[0]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156561,7 +157303,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:26: test-ovsdb log-io file read-only read read"
 at_fn_check_prepare_trace "ovsdb-log.at:26"
 ( $at_check_trace; test-ovsdb log-io file read-only read read
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156579,7 +157321,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:32: test -f .file.~lock~"
 at_fn_check_prepare_trace "ovsdb-log.at:32"
 ( $at_check_trace; test -f .file.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156593,13 +157335,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_926
-#AT_START_927
-at_fn_group_banner 927 'ovsdb-log.at:35' \
+#AT_STOP_929
+#AT_START_930
+at_fn_group_banner 930 'ovsdb-log.at:35' \
   "check that create fails if file exists" "         " 57
 at_xfail=no
 (
-  $as_echo "927. $at_setup_line: testing $at_desc ..."
+  $as_echo "930. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -156608,7 +157350,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:38: test-ovsdb log-io file create 'write:[1]'"
 at_fn_check_prepare_trace "ovsdb-log.at:38"
 ( $at_check_trace; test-ovsdb log-io file create 'write:[1]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156625,7 +157367,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:43: test-ovsdb log-io file read-only read"
 at_fn_check_prepare_trace "ovsdb-log.at:43"
 ( $at_check_trace; test-ovsdb log-io file read-only read
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156642,7 +157384,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:48: test-ovsdb log-io file create read"
 at_fn_check_prepare_trace "ovsdb-log.at:48"
 ( $at_check_trace; test-ovsdb log-io file create read
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "test-ovsdb: I/O error: create: file failed (File exists)
@@ -156658,7 +157400,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:52: test -f .file.~lock~"
 at_fn_check_prepare_trace "ovsdb-log.at:52"
 ( $at_check_trace; test -f .file.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156672,13 +157414,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_927
-#AT_START_928
-at_fn_group_banner 928 'ovsdb-log.at:55' \
+#AT_STOP_930
+#AT_START_931
+at_fn_group_banner 931 'ovsdb-log.at:55' \
   "write one, reread" "                              " 57
 at_xfail=no
 (
-  $as_echo "928. $at_setup_line: testing $at_desc ..."
+  $as_echo "931. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -156687,7 +157429,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:58: test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'"
 at_fn_check_prepare_trace "ovsdb-log.at:58"
 ( $at_check_trace; test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156706,7 +157448,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:65: test-ovsdb log-io file read-only read read read read"
 at_fn_check_prepare_trace "ovsdb-log.at:65"
 ( $at_check_trace; test-ovsdb log-io file read-only read read read read
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156726,7 +157468,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:73: test -f .file.~lock~"
 at_fn_check_prepare_trace "ovsdb-log.at:73"
 ( $at_check_trace; test -f .file.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156740,13 +157482,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_928
-#AT_START_929
-at_fn_group_banner 929 'ovsdb-log.at:76' \
+#AT_STOP_931
+#AT_START_932
+at_fn_group_banner 932 'ovsdb-log.at:76' \
   "write one, reread, append" "                      " 57
 at_xfail=no
 (
-  $as_echo "929. $at_setup_line: testing $at_desc ..."
+  $as_echo "932. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -156755,7 +157497,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:79: test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'"
 at_fn_check_prepare_trace "ovsdb-log.at:79"
 ( $at_check_trace; test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156774,7 +157516,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:86: test-ovsdb log-io file read/write read read read 'write:[\"append\"]'"
 at_fn_check_prepare_trace "ovsdb-log.at:86"
 ( $at_check_trace; test-ovsdb log-io file read/write read read read 'write:["append"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156794,7 +157536,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:94: test-ovsdb log-io file read-only read read read read read"
 at_fn_check_prepare_trace "ovsdb-log.at:94"
 ( $at_check_trace; test-ovsdb log-io file read-only read read read read read
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156815,7 +157557,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:103: test -f .file.~lock~"
 at_fn_check_prepare_trace "ovsdb-log.at:103"
 ( $at_check_trace; test -f .file.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156829,13 +157571,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_929
-#AT_START_930
-at_fn_group_banner 930 'ovsdb-log.at:106' \
+#AT_STOP_932
+#AT_START_933
+at_fn_group_banner 933 'ovsdb-log.at:106' \
   "write, reread one, overwrite" "                   " 57
 at_xfail=no
 (
-  $as_echo "930. $at_setup_line: testing $at_desc ..."
+  $as_echo "933. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -156844,7 +157586,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:109: test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'"
 at_fn_check_prepare_trace "ovsdb-log.at:109"
 ( $at_check_trace; test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156863,7 +157605,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:116: test-ovsdb log-io file read/write read 'write:[\"more data\"]'"
 at_fn_check_prepare_trace "ovsdb-log.at:116"
 ( $at_check_trace; test-ovsdb log-io file read/write read 'write:["more data"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156881,7 +157623,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:122: test-ovsdb log-io file read-only read read read"
 at_fn_check_prepare_trace "ovsdb-log.at:122"
 ( $at_check_trace; test-ovsdb log-io file read-only read read read
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156900,7 +157642,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:129: test -f .file.~lock~"
 at_fn_check_prepare_trace "ovsdb-log.at:129"
 ( $at_check_trace; test -f .file.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156914,13 +157656,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_930
-#AT_START_931
-at_fn_group_banner 931 'ovsdb-log.at:132' \
+#AT_STOP_933
+#AT_START_934
+at_fn_group_banner 934 'ovsdb-log.at:132' \
   "write, add corrupted data, read" "                " 57
 at_xfail=no
 (
-  $as_echo "931. $at_setup_line: testing $at_desc ..."
+  $as_echo "934. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -156929,7 +157671,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:135: test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'"
 at_fn_check_prepare_trace "ovsdb-log.at:135"
 ( $at_check_trace; test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156948,7 +157690,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:142: echo 'xxx' >> file"
 at_fn_check_prepare_trace "ovsdb-log.at:142"
 ( $at_check_trace; echo 'xxx' >> file
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156962,7 +157704,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:143: test-ovsdb log-io file read-only read read read read"
 at_fn_check_prepare_trace "ovsdb-log.at:143"
 ( $at_check_trace; test-ovsdb log-io file read-only read read read read
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -156982,7 +157724,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:151: test -f .file.~lock~"
 at_fn_check_prepare_trace "ovsdb-log.at:151"
 ( $at_check_trace; test -f .file.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -156996,13 +157738,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_931
-#AT_START_932
-at_fn_group_banner 932 'ovsdb-log.at:154' \
+#AT_STOP_934
+#AT_START_935
+at_fn_group_banner 935 'ovsdb-log.at:154' \
   "write, add corrupted data, read, overwrite" "     " 57
 at_xfail=no
 (
-  $as_echo "932. $at_setup_line: testing $at_desc ..."
+  $as_echo "935. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -157011,7 +157753,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:157: test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'"
 at_fn_check_prepare_trace "ovsdb-log.at:157"
 ( $at_check_trace; test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157030,7 +157772,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:164: echo 'xxx' >> file"
 at_fn_check_prepare_trace "ovsdb-log.at:164"
 ( $at_check_trace; echo 'xxx' >> file
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157044,7 +157786,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:165: test-ovsdb log-io file read/write read read read read 'write:[3]'"
 at_fn_check_prepare_trace "ovsdb-log.at:165"
 ( $at_check_trace; test-ovsdb log-io file read/write read read read read 'write:[3]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157065,7 +157807,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:174: test-ovsdb log-io file read-only read read read read read"
 at_fn_check_prepare_trace "ovsdb-log.at:174"
 ( $at_check_trace; test-ovsdb log-io file read-only read read read read read
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157086,7 +157828,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:183: test -f .file.~lock~"
 at_fn_check_prepare_trace "ovsdb-log.at:183"
 ( $at_check_trace; test -f .file.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157100,13 +157842,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_932
-#AT_START_933
-at_fn_group_banner 933 'ovsdb-log.at:186' \
+#AT_STOP_935
+#AT_START_936
+at_fn_group_banner 936 'ovsdb-log.at:186' \
   "write, corrupt some data, read, overwrite" "      " 57
 at_xfail=no
 (
-  $as_echo "933. $at_setup_line: testing $at_desc ..."
+  $as_echo "936. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -157115,7 +157857,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:189: test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'"
 at_fn_check_prepare_trace "ovsdb-log.at:189"
 ( $at_check_trace; test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157134,7 +157876,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:196: sed 's/\\[2]/[3]/' < file > file.tmp"
 at_fn_check_prepare_trace "ovsdb-log.at:196"
 ( $at_check_trace; sed 's/\[2]/[3]/' < file > file.tmp
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157148,7 +157890,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:197: mv file.tmp file"
 at_fn_check_prepare_trace "ovsdb-log.at:197"
 ( $at_check_trace; mv file.tmp file
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157162,7 +157904,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:198: grep -c '\\[3]' file"
 at_fn_check_prepare_trace "ovsdb-log.at:198"
 ( $at_check_trace; grep -c '\[3]' file
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157178,7 +157920,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:200: test-ovsdb log-io file read/write read read read 'write:[\"longer data\"]'"
 at_fn_check_prepare_trace "ovsdb-log.at:200"
 ( $at_check_trace; test-ovsdb log-io file read/write read read read 'write:["longer data"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157198,7 +157940,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:208: test-ovsdb log-io file read-only read read read read"
 at_fn_check_prepare_trace "ovsdb-log.at:208"
 ( $at_check_trace; test-ovsdb log-io file read-only read read read read
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157218,7 +157960,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:216: test -f .file.~lock~"
 at_fn_check_prepare_trace "ovsdb-log.at:216"
 ( $at_check_trace; test -f .file.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157232,13 +157974,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_933
-#AT_START_934
-at_fn_group_banner 934 'ovsdb-log.at:219' \
+#AT_STOP_936
+#AT_START_937
+at_fn_group_banner 937 'ovsdb-log.at:219' \
   "write, truncate file, read, overwrite" "          " 57
 at_xfail=no
 (
-  $as_echo "934. $at_setup_line: testing $at_desc ..."
+  $as_echo "937. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -157247,7 +157989,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:222: test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'"
 at_fn_check_prepare_trace "ovsdb-log.at:222"
 ( $at_check_trace; test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157266,7 +158008,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:229: sed 's/\\[2]/2/' < file > file.tmp"
 at_fn_check_prepare_trace "ovsdb-log.at:229"
 ( $at_check_trace; sed 's/\[2]/2/' < file > file.tmp
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157280,7 +158022,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:230: mv file.tmp file"
 at_fn_check_prepare_trace "ovsdb-log.at:230"
 ( $at_check_trace; mv file.tmp file
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157294,7 +158036,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:231: grep -c '^2\$' file"
 at_fn_check_prepare_dynamic "grep -c '^2$' file" "ovsdb-log.at:231"
 ( $at_check_trace; grep -c '^2$' file
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157310,7 +158052,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:233: test-ovsdb log-io file read/write read read read 'write:[\"longer data\"]'"
 at_fn_check_prepare_trace "ovsdb-log.at:233"
 ( $at_check_trace; test-ovsdb log-io file read/write read read read 'write:["longer data"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157330,7 +158072,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:241: test-ovsdb log-io file read-only read read read read"
 at_fn_check_prepare_trace "ovsdb-log.at:241"
 ( $at_check_trace; test-ovsdb log-io file read-only read read read read
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157350,7 +158092,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:249: test -f .file.~lock~"
 at_fn_check_prepare_trace "ovsdb-log.at:249"
 ( $at_check_trace; test -f .file.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157364,13 +158106,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_934
-#AT_START_935
-at_fn_group_banner 935 'ovsdb-log.at:252' \
+#AT_STOP_937
+#AT_START_938
+at_fn_group_banner 938 'ovsdb-log.at:252' \
   "write bad JSON, read, overwrite" "                " 57
 at_xfail=no
 (
-  $as_echo "935. $at_setup_line: testing $at_desc ..."
+  $as_echo "938. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -157379,7 +158121,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:255: test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'"
 at_fn_check_prepare_trace "ovsdb-log.at:255"
 ( $at_check_trace; test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157398,7 +158140,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:262: printf '%s\\n%s\\n' 'OVSDB JSON 5 d910b02871075d3156ec8675dfc95b7d5d640aa6' 'null' >> file"
 at_fn_check_prepare_trace "ovsdb-log.at:262"
 ( $at_check_trace; printf '%s\n%s\n' 'OVSDB JSON 5 d910b02871075d3156ec8675dfc95b7d5d640aa6' 'null' >> file
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157412,7 +158154,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:263: test-ovsdb log-io file read/write read read read read 'write:[\"replacement data\"]'"
 at_fn_check_prepare_trace "ovsdb-log.at:263"
 ( $at_check_trace; test-ovsdb log-io file read/write read read read read 'write:["replacement data"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157433,7 +158175,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:272: test-ovsdb log-io file read-only read read read read read"
 at_fn_check_prepare_trace "ovsdb-log.at:272"
 ( $at_check_trace; test-ovsdb log-io file read-only read read read read read
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157454,7 +158196,7 @@
 $as_echo "$at_srcdir/ovsdb-log.at:281: test -f .file.~lock~"
 at_fn_check_prepare_trace "ovsdb-log.at:281"
 ( $at_check_trace; test -f .file.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157468,13 +158210,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_935
-#AT_START_936
-at_fn_group_banner 936 'ovsdb-types.at:3' \
+#AT_STOP_938
+#AT_START_939
+at_fn_group_banner 939 'ovsdb-types.at:3' \
   "integer - C" "                                    " 58
 at_xfail=no
 (
-  $as_echo "936. $at_setup_line: testing $at_desc ..."
+  $as_echo "939. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -157482,7 +158224,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:3: test-ovsdb parse-atomic-type '[\"integer\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:3"
 ( $at_check_trace; test-ovsdb parse-atomic-type '["integer"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157497,13 +158239,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_936
-#AT_START_937
-at_fn_group_banner 937 'ovsdb-types.at:3' \
+#AT_STOP_939
+#AT_START_940
+at_fn_group_banner 940 'ovsdb-types.at:3' \
   "integer - Python" "                               " 58
 at_xfail=no
 (
-  $as_echo "937. $at_setup_line: testing $at_desc ..."
+  $as_echo "940. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:3" >"$at_check_line_file"
@@ -157515,7 +158257,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:3: \$PYTHON \$srcdir/test-ovsdb.py parse-atomic-type '[\"integer\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atomic-type '[\"integer\"]' " "ovsdb-types.at:3"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atomic-type '["integer"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157530,13 +158272,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_937
-#AT_START_938
-at_fn_group_banner 938 'ovsdb-types.at:5' \
+#AT_STOP_940
+#AT_START_941
+at_fn_group_banner 941 'ovsdb-types.at:5' \
   "real - C" "                                       " 58
 at_xfail=no
 (
-  $as_echo "938. $at_setup_line: testing $at_desc ..."
+  $as_echo "941. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -157544,7 +158286,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:5: test-ovsdb parse-atomic-type '[\"real\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:5"
 ( $at_check_trace; test-ovsdb parse-atomic-type '["real"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157559,13 +158301,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_938
-#AT_START_939
-at_fn_group_banner 939 'ovsdb-types.at:5' \
+#AT_STOP_941
+#AT_START_942
+at_fn_group_banner 942 'ovsdb-types.at:5' \
   "real - Python" "                                  " 58
 at_xfail=no
 (
-  $as_echo "939. $at_setup_line: testing $at_desc ..."
+  $as_echo "942. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:5" >"$at_check_line_file"
@@ -157577,7 +158319,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:5: \$PYTHON \$srcdir/test-ovsdb.py parse-atomic-type '[\"real\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atomic-type '[\"real\"]' " "ovsdb-types.at:5"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atomic-type '["real"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157592,13 +158334,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_939
-#AT_START_940
-at_fn_group_banner 940 'ovsdb-types.at:7' \
+#AT_STOP_942
+#AT_START_943
+at_fn_group_banner 943 'ovsdb-types.at:7' \
   "boolean - C" "                                    " 58
 at_xfail=no
 (
-  $as_echo "940. $at_setup_line: testing $at_desc ..."
+  $as_echo "943. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -157606,7 +158348,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:7: test-ovsdb parse-atomic-type '[\"boolean\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:7"
 ( $at_check_trace; test-ovsdb parse-atomic-type '["boolean"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157621,13 +158363,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_940
-#AT_START_941
-at_fn_group_banner 941 'ovsdb-types.at:7' \
+#AT_STOP_943
+#AT_START_944
+at_fn_group_banner 944 'ovsdb-types.at:7' \
   "boolean - Python" "                               " 58
 at_xfail=no
 (
-  $as_echo "941. $at_setup_line: testing $at_desc ..."
+  $as_echo "944. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:7" >"$at_check_line_file"
@@ -157639,7 +158381,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:7: \$PYTHON \$srcdir/test-ovsdb.py parse-atomic-type '[\"boolean\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atomic-type '[\"boolean\"]' " "ovsdb-types.at:7"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atomic-type '["boolean"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157654,13 +158396,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_941
-#AT_START_942
-at_fn_group_banner 942 'ovsdb-types.at:9' \
+#AT_STOP_944
+#AT_START_945
+at_fn_group_banner 945 'ovsdb-types.at:9' \
   "string - C" "                                     " 58
 at_xfail=no
 (
-  $as_echo "942. $at_setup_line: testing $at_desc ..."
+  $as_echo "945. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -157668,7 +158410,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:9: test-ovsdb parse-atomic-type '[\"string\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:9"
 ( $at_check_trace; test-ovsdb parse-atomic-type '["string"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157683,13 +158425,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_942
-#AT_START_943
-at_fn_group_banner 943 'ovsdb-types.at:9' \
+#AT_STOP_945
+#AT_START_946
+at_fn_group_banner 946 'ovsdb-types.at:9' \
   "string - Python" "                                " 58
 at_xfail=no
 (
-  $as_echo "943. $at_setup_line: testing $at_desc ..."
+  $as_echo "946. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:9" >"$at_check_line_file"
@@ -157701,7 +158443,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:9: \$PYTHON \$srcdir/test-ovsdb.py parse-atomic-type '[\"string\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atomic-type '[\"string\"]' " "ovsdb-types.at:9"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atomic-type '["string"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157716,13 +158458,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_943
-#AT_START_944
-at_fn_group_banner 944 'ovsdb-types.at:11' \
+#AT_STOP_946
+#AT_START_947
+at_fn_group_banner 947 'ovsdb-types.at:11' \
   "uuid - C" "                                       " 58
 at_xfail=no
 (
-  $as_echo "944. $at_setup_line: testing $at_desc ..."
+  $as_echo "947. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -157730,7 +158472,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:11: test-ovsdb parse-atomic-type '[\"uuid\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:11"
 ( $at_check_trace; test-ovsdb parse-atomic-type '["uuid"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157745,13 +158487,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_944
-#AT_START_945
-at_fn_group_banner 945 'ovsdb-types.at:11' \
+#AT_STOP_947
+#AT_START_948
+at_fn_group_banner 948 'ovsdb-types.at:11' \
   "uuid - Python" "                                  " 58
 at_xfail=no
 (
-  $as_echo "945. $at_setup_line: testing $at_desc ..."
+  $as_echo "948. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:11" >"$at_check_line_file"
@@ -157763,7 +158505,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:11: \$PYTHON \$srcdir/test-ovsdb.py parse-atomic-type '[\"uuid\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atomic-type '[\"uuid\"]' " "ovsdb-types.at:11"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atomic-type '["uuid"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157778,13 +158520,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_945
-#AT_START_946
-at_fn_group_banner 946 'ovsdb-types.at:13' \
+#AT_STOP_948
+#AT_START_949
+at_fn_group_banner 949 'ovsdb-types.at:13' \
   "void is not a valid atomic-type - C" "            " 58
 at_xfail=no
 (
-  $as_echo "946. $at_setup_line: testing $at_desc ..."
+  $as_echo "949. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -157792,7 +158534,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:13: test-ovsdb parse-atomic-type '[\"void\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:13"
 ( $at_check_trace; test-ovsdb parse-atomic-type '["void"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -157816,7 +158558,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157829,13 +158571,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_946
-#AT_START_947
-at_fn_group_banner 947 'ovsdb-types.at:13' \
+#AT_STOP_949
+#AT_START_950
+at_fn_group_banner 950 'ovsdb-types.at:13' \
   "void is not a valid atomic-type - Python" "       " 58
 at_xfail=no
 (
-  $as_echo "947. $at_setup_line: testing $at_desc ..."
+  $as_echo "950. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:13" >"$at_check_line_file"
@@ -157846,7 +158588,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:13: \$PYTHON \$srcdir/test-ovsdb.py parse-atomic-type '[\"void\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atomic-type '[\"void\"]' " "ovsdb-types.at:13"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atomic-type '["void"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -157870,7 +158612,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -157883,13 +158625,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_947
-#AT_START_948
-at_fn_group_banner 948 'ovsdb-types.at:18' \
+#AT_STOP_950
+#AT_START_951
+at_fn_group_banner 951 'ovsdb-types.at:18' \
   "integer enum - C" "                               " 59
 at_xfail=no
 (
-  $as_echo "948. $at_setup_line: testing $at_desc ..."
+  $as_echo "951. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -157897,7 +158639,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:18: test-ovsdb parse-base-type '{\"type\": \"integer\", \"enum\": [\"set\", [-1, 4, 5]]}' "
 at_fn_check_prepare_trace "ovsdb-types.at:18"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "integer", "enum": ["set", [-1, 4, 5]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157912,13 +158654,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_948
-#AT_START_949
-at_fn_group_banner 949 'ovsdb-types.at:18' \
+#AT_STOP_951
+#AT_START_952
+at_fn_group_banner 952 'ovsdb-types.at:18' \
   "integer enum - Python" "                          " 59
 at_xfail=no
 (
-  $as_echo "949. $at_setup_line: testing $at_desc ..."
+  $as_echo "952. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:18" >"$at_check_line_file"
@@ -157930,7 +158672,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:18: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"integer\", \"enum\": [\"set\", [-1, 4, 5]]}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"integer\", \"enum\": [\"set\", [-1, 4, 5]]}' " "ovsdb-types.at:18"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "integer", "enum": ["set", [-1, 4, 5]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157945,13 +158687,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_949
-#AT_START_950
-at_fn_group_banner 950 'ovsdb-types.at:21' \
+#AT_STOP_952
+#AT_START_953
+at_fn_group_banner 953 'ovsdb-types.at:21' \
   "integer >= 5 - C" "                               " 59
 at_xfail=no
 (
-  $as_echo "950. $at_setup_line: testing $at_desc ..."
+  $as_echo "953. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -157959,7 +158701,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:21: test-ovsdb parse-base-type '{\"type\": \"integer\", \"minInteger\": 5}' "
 at_fn_check_prepare_trace "ovsdb-types.at:21"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "integer", "minInteger": 5}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -157974,13 +158716,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_950
-#AT_START_951
-at_fn_group_banner 951 'ovsdb-types.at:21' \
+#AT_STOP_953
+#AT_START_954
+at_fn_group_banner 954 'ovsdb-types.at:21' \
   "integer >= 5 - Python" "                          " 59
 at_xfail=no
 (
-  $as_echo "951. $at_setup_line: testing $at_desc ..."
+  $as_echo "954. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:21" >"$at_check_line_file"
@@ -157992,7 +158734,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:21: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"integer\", \"minInteger\": 5}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"integer\", \"minInteger\": 5}' " "ovsdb-types.at:21"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "integer", "minInteger": 5}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158007,13 +158749,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_951
-#AT_START_952
-at_fn_group_banner 952 'ovsdb-types.at:24' \
+#AT_STOP_954
+#AT_START_955
+at_fn_group_banner 955 'ovsdb-types.at:24' \
   "integer <= 7 - C" "                               " 59
 at_xfail=no
 (
-  $as_echo "952. $at_setup_line: testing $at_desc ..."
+  $as_echo "955. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158021,7 +158763,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:24: test-ovsdb parse-base-type '{\"type\": \"integer\", \"maxInteger\": 7}' "
 at_fn_check_prepare_trace "ovsdb-types.at:24"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "integer", "maxInteger": 7}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158036,13 +158778,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_952
-#AT_START_953
-at_fn_group_banner 953 'ovsdb-types.at:24' \
+#AT_STOP_955
+#AT_START_956
+at_fn_group_banner 956 'ovsdb-types.at:24' \
   "integer <= 7 - Python" "                          " 59
 at_xfail=no
 (
-  $as_echo "953. $at_setup_line: testing $at_desc ..."
+  $as_echo "956. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:24" >"$at_check_line_file"
@@ -158054,7 +158796,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:24: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"integer\", \"maxInteger\": 7}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"integer\", \"maxInteger\": 7}' " "ovsdb-types.at:24"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "integer", "maxInteger": 7}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158069,13 +158811,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_953
-#AT_START_954
-at_fn_group_banner 954 'ovsdb-types.at:27' \
+#AT_STOP_956
+#AT_START_957
+at_fn_group_banner 957 'ovsdb-types.at:27' \
   "integer between -5 and 10 - C" "                  " 59
 at_xfail=no
 (
-  $as_echo "954. $at_setup_line: testing $at_desc ..."
+  $as_echo "957. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158083,7 +158825,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:27: test-ovsdb parse-base-type '{\"type\": \"integer\", \"minInteger\": -5, \"maxInteger\": 10}'"
 at_fn_check_prepare_trace "ovsdb-types.at:27"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "integer", "minInteger": -5, "maxInteger": 10}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158098,13 +158840,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_954
-#AT_START_955
-at_fn_group_banner 955 'ovsdb-types.at:27' \
+#AT_STOP_957
+#AT_START_958
+at_fn_group_banner 958 'ovsdb-types.at:27' \
   "integer between -5 and 10 - Python" "             " 59
 at_xfail=no
 (
-  $as_echo "955. $at_setup_line: testing $at_desc ..."
+  $as_echo "958. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:27" >"$at_check_line_file"
@@ -158116,7 +158858,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:27: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"integer\", \"minInteger\": -5, \"maxInteger\": 10}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"integer\", \"minInteger\": -5, \"maxInteger\": 10}'" "ovsdb-types.at:27"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "integer", "minInteger": -5, "maxInteger": 10}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158131,13 +158873,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_955
-#AT_START_956
-at_fn_group_banner 956 'ovsdb-types.at:30' \
+#AT_STOP_958
+#AT_START_959
+at_fn_group_banner 959 'ovsdb-types.at:30' \
   "integer max may not be less than min - C" "       " 59
 at_xfail=no
 (
-  $as_echo "956. $at_setup_line: testing $at_desc ..."
+  $as_echo "959. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158145,7 +158887,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:30: test-ovsdb parse-base-type '{\"type\": \"integer\", \"minInteger\": 5, \"maxInteger\": 3}'"
 at_fn_check_prepare_trace "ovsdb-types.at:30"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "integer", "minInteger": 5, "maxInteger": 3}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -158169,7 +158911,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -158182,13 +158924,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_956
-#AT_START_957
-at_fn_group_banner 957 'ovsdb-types.at:30' \
+#AT_STOP_959
+#AT_START_960
+at_fn_group_banner 960 'ovsdb-types.at:30' \
   "integer max may not be less than min - Python" "  " 59
 at_xfail=no
 (
-  $as_echo "957. $at_setup_line: testing $at_desc ..."
+  $as_echo "960. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:30" >"$at_check_line_file"
@@ -158199,7 +158941,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:30: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"integer\", \"minInteger\": 5, \"maxInteger\": 3}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"integer\", \"minInteger\": 5, \"maxInteger\": 3}'" "ovsdb-types.at:30"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "integer", "minInteger": 5, "maxInteger": 3}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -158223,7 +158965,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -158236,13 +158978,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_957
-#AT_START_958
-at_fn_group_banner 958 'ovsdb-types.at:34' \
+#AT_STOP_960
+#AT_START_961
+at_fn_group_banner 961 'ovsdb-types.at:34' \
   "real enum - C" "                                  " 59
 at_xfail=no
 (
-  $as_echo "958. $at_setup_line: testing $at_desc ..."
+  $as_echo "961. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158250,7 +158992,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:34: test-ovsdb parse-base-type '{\"type\": \"real\", \"enum\": [\"set\", [1.5, 0, 2.75]]}' "
 at_fn_check_prepare_trace "ovsdb-types.at:34"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "real", "enum": ["set", [1.5, 0, 2.75]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158265,13 +159007,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_958
-#AT_START_959
-at_fn_group_banner 959 'ovsdb-types.at:34' \
+#AT_STOP_961
+#AT_START_962
+at_fn_group_banner 962 'ovsdb-types.at:34' \
   "real enum - Python" "                             " 59
 at_xfail=no
 (
-  $as_echo "959. $at_setup_line: testing $at_desc ..."
+  $as_echo "962. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:34" >"$at_check_line_file"
@@ -158283,7 +159025,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:34: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"real\", \"enum\": [\"set\", [1.5, 0, 2.75]]}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"real\", \"enum\": [\"set\", [1.5, 0, 2.75]]}' " "ovsdb-types.at:34"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "real", "enum": ["set", [1.5, 0, 2.75]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158298,13 +159040,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_959
-#AT_START_960
-at_fn_group_banner 960 'ovsdb-types.at:37' \
+#AT_STOP_962
+#AT_START_963
+at_fn_group_banner 963 'ovsdb-types.at:37' \
   "real >= -1.5 - C" "                               " 59
 at_xfail=no
 (
-  $as_echo "960. $at_setup_line: testing $at_desc ..."
+  $as_echo "963. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158312,7 +159054,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:37: test-ovsdb parse-base-type '{\"type\": \"real\", \"minReal\": -1.5}'"
 at_fn_check_prepare_trace "ovsdb-types.at:37"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "real", "minReal": -1.5}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158327,13 +159069,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_960
-#AT_START_961
-at_fn_group_banner 961 'ovsdb-types.at:37' \
+#AT_STOP_963
+#AT_START_964
+at_fn_group_banner 964 'ovsdb-types.at:37' \
   "real >= -1.5 - Python" "                          " 59
 at_xfail=no
 (
-  $as_echo "961. $at_setup_line: testing $at_desc ..."
+  $as_echo "964. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:37" >"$at_check_line_file"
@@ -158345,7 +159087,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:37: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"real\", \"minReal\": -1.5}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"real\", \"minReal\": -1.5}'" "ovsdb-types.at:37"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "real", "minReal": -1.5}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158360,13 +159102,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_961
-#AT_START_962
-at_fn_group_banner 962 'ovsdb-types.at:40' \
+#AT_STOP_964
+#AT_START_965
+at_fn_group_banner 965 'ovsdb-types.at:40' \
   "real <= 1e5 - C" "                                " 59
 at_xfail=no
 (
-  $as_echo "962. $at_setup_line: testing $at_desc ..."
+  $as_echo "965. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158374,7 +159116,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:40: test-ovsdb parse-base-type '{\"type\": \"real\", \"maxReal\": 1e5}'"
 at_fn_check_prepare_trace "ovsdb-types.at:40"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "real", "maxReal": 1e5}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158389,13 +159131,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_962
-#AT_START_963
-at_fn_group_banner 963 'ovsdb-types.at:40' \
+#AT_STOP_965
+#AT_START_966
+at_fn_group_banner 966 'ovsdb-types.at:40' \
   "real <= 1e5 - Python" "                           " 59
 at_xfail=no
 (
-  $as_echo "963. $at_setup_line: testing $at_desc ..."
+  $as_echo "966. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:40" >"$at_check_line_file"
@@ -158407,7 +159149,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:40: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"real\", \"maxReal\": 1e5}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"real\", \"maxReal\": 1e5}'" "ovsdb-types.at:40"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "real", "maxReal": 1e5}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158422,13 +159164,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_963
-#AT_START_964
-at_fn_group_banner 964 'ovsdb-types.at:43' \
+#AT_STOP_966
+#AT_START_967
+at_fn_group_banner 967 'ovsdb-types.at:43' \
   "real between -2.5 and 3.75 - C" "                 " 59
 at_xfail=no
 (
-  $as_echo "964. $at_setup_line: testing $at_desc ..."
+  $as_echo "967. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158436,7 +159178,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:43: test-ovsdb parse-base-type '{\"type\": \"real\", \"minReal\": -2.5, \"maxReal\": 3.75}'"
 at_fn_check_prepare_trace "ovsdb-types.at:43"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "real", "minReal": -2.5, "maxReal": 3.75}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158451,13 +159193,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_964
-#AT_START_965
-at_fn_group_banner 965 'ovsdb-types.at:43' \
+#AT_STOP_967
+#AT_START_968
+at_fn_group_banner 968 'ovsdb-types.at:43' \
   "real between -2.5 and 3.75 - Python" "            " 59
 at_xfail=no
 (
-  $as_echo "965. $at_setup_line: testing $at_desc ..."
+  $as_echo "968. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:43" >"$at_check_line_file"
@@ -158469,7 +159211,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:43: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"real\", \"minReal\": -2.5, \"maxReal\": 3.75}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"real\", \"minReal\": -2.5, \"maxReal\": 3.75}'" "ovsdb-types.at:43"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "real", "minReal": -2.5, "maxReal": 3.75}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158484,13 +159226,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_965
-#AT_START_966
-at_fn_group_banner 966 'ovsdb-types.at:46' \
+#AT_STOP_968
+#AT_START_969
+at_fn_group_banner 969 'ovsdb-types.at:46' \
   "real max may not be less than min - C" "          " 59
 at_xfail=no
 (
-  $as_echo "966. $at_setup_line: testing $at_desc ..."
+  $as_echo "969. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158498,7 +159240,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:46: test-ovsdb parse-base-type '{\"type\": \"real\", \"minReal\": 555, \"maxReal\": 444}'"
 at_fn_check_prepare_trace "ovsdb-types.at:46"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "real", "minReal": 555, "maxReal": 444}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -158522,7 +159264,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -158535,13 +159277,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_966
-#AT_START_967
-at_fn_group_banner 967 'ovsdb-types.at:46' \
+#AT_STOP_969
+#AT_START_970
+at_fn_group_banner 970 'ovsdb-types.at:46' \
   "real max may not be less than min - Python" "     " 59
 at_xfail=no
 (
-  $as_echo "967. $at_setup_line: testing $at_desc ..."
+  $as_echo "970. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:46" >"$at_check_line_file"
@@ -158552,7 +159294,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:46: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"real\", \"minReal\": 555, \"maxReal\": 444}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"real\", \"minReal\": 555, \"maxReal\": 444}'" "ovsdb-types.at:46"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "real", "minReal": 555, "maxReal": 444}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -158576,7 +159318,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -158589,13 +159331,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_967
-#AT_START_968
-at_fn_group_banner 968 'ovsdb-types.at:50' \
+#AT_STOP_970
+#AT_START_971
+at_fn_group_banner 971 'ovsdb-types.at:50' \
   "boolean - C" "                                    " 59
 at_xfail=no
 (
-  $as_echo "968. $at_setup_line: testing $at_desc ..."
+  $as_echo "971. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158603,7 +159345,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:50: test-ovsdb parse-base-type '[{\"type\": \"boolean\"}]' "
 at_fn_check_prepare_trace "ovsdb-types.at:50"
 ( $at_check_trace; test-ovsdb parse-base-type '[{"type": "boolean"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158618,13 +159360,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_968
-#AT_START_969
-at_fn_group_banner 969 'ovsdb-types.at:50' \
+#AT_STOP_971
+#AT_START_972
+at_fn_group_banner 972 'ovsdb-types.at:50' \
   "boolean - Python" "                               " 59
 at_xfail=no
 (
-  $as_echo "969. $at_setup_line: testing $at_desc ..."
+  $as_echo "972. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:50" >"$at_check_line_file"
@@ -158636,7 +159378,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:50: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '[{\"type\": \"boolean\"}]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '[{\"type\": \"boolean\"}]' " "ovsdb-types.at:50"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '[{"type": "boolean"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158651,13 +159393,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_969
-#AT_START_970
-at_fn_group_banner 970 'ovsdb-types.at:52' \
+#AT_STOP_972
+#AT_START_973
+at_fn_group_banner 973 'ovsdb-types.at:52' \
   "boolean enum - C" "                               " 59
 at_xfail=no
 (
-  $as_echo "970. $at_setup_line: testing $at_desc ..."
+  $as_echo "973. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158665,7 +159407,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:52: test-ovsdb parse-base-type '{\"type\": \"boolean\", \"enum\": true}' "
 at_fn_check_prepare_trace "ovsdb-types.at:52"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "boolean", "enum": true}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158680,13 +159422,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_970
-#AT_START_971
-at_fn_group_banner 971 'ovsdb-types.at:52' \
+#AT_STOP_973
+#AT_START_974
+at_fn_group_banner 974 'ovsdb-types.at:52' \
   "boolean enum - Python" "                          " 59
 at_xfail=no
 (
-  $as_echo "971. $at_setup_line: testing $at_desc ..."
+  $as_echo "974. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:52" >"$at_check_line_file"
@@ -158698,7 +159440,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:52: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"boolean\", \"enum\": true}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"boolean\", \"enum\": true}' " "ovsdb-types.at:52"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "boolean", "enum": true}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158713,13 +159455,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_971
-#AT_START_972
-at_fn_group_banner 972 'ovsdb-types.at:56' \
+#AT_STOP_974
+#AT_START_975
+at_fn_group_banner 975 'ovsdb-types.at:56' \
   "string enum - C" "                                " 59
 at_xfail=no
 (
-  $as_echo "972. $at_setup_line: testing $at_desc ..."
+  $as_echo "975. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158727,7 +159469,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:56: test-ovsdb parse-base-type '{\"type\": \"string\", \"enum\": [\"set\", [\"def\", \"abc\"]]}'"
 at_fn_check_prepare_trace "ovsdb-types.at:56"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "string", "enum": ["set", ["def", "abc"]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158742,13 +159484,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_972
-#AT_START_973
-at_fn_group_banner 973 'ovsdb-types.at:56' \
+#AT_STOP_975
+#AT_START_976
+at_fn_group_banner 976 'ovsdb-types.at:56' \
   "string enum - Python" "                           " 59
 at_xfail=no
 (
-  $as_echo "973. $at_setup_line: testing $at_desc ..."
+  $as_echo "976. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:56" >"$at_check_line_file"
@@ -158760,7 +159502,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:56: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"string\", \"enum\": [\"set\", [\"def\", \"abc\"]]}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"string\", \"enum\": [\"set\", [\"def\", \"abc\"]]}'" "ovsdb-types.at:56"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "string", "enum": ["set", ["def", "abc"]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158775,13 +159517,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_973
-#AT_START_974
-at_fn_group_banner 974 'ovsdb-types.at:59' \
+#AT_STOP_976
+#AT_START_977
+at_fn_group_banner 977 'ovsdb-types.at:59' \
   "string minLength - C" "                           " 59
 at_xfail=no
 (
-  $as_echo "974. $at_setup_line: testing $at_desc ..."
+  $as_echo "977. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158789,7 +159531,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:59: test-ovsdb parse-base-type '{\"type\": \"string\", \"minLength\": 1}'"
 at_fn_check_prepare_trace "ovsdb-types.at:59"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "string", "minLength": 1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158804,13 +159546,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_974
-#AT_START_975
-at_fn_group_banner 975 'ovsdb-types.at:59' \
+#AT_STOP_977
+#AT_START_978
+at_fn_group_banner 978 'ovsdb-types.at:59' \
   "string minLength - Python" "                      " 59
 at_xfail=no
 (
-  $as_echo "975. $at_setup_line: testing $at_desc ..."
+  $as_echo "978. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:59" >"$at_check_line_file"
@@ -158822,7 +159564,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:59: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"string\", \"minLength\": 1}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"string\", \"minLength\": 1}'" "ovsdb-types.at:59"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "string", "minLength": 1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158837,13 +159579,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_975
-#AT_START_976
-at_fn_group_banner 976 'ovsdb-types.at:62' \
+#AT_STOP_978
+#AT_START_979
+at_fn_group_banner 979 'ovsdb-types.at:62' \
   "string maxLength - C" "                           " 59
 at_xfail=no
 (
-  $as_echo "976. $at_setup_line: testing $at_desc ..."
+  $as_echo "979. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158851,7 +159593,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:62: test-ovsdb parse-base-type '{\"type\": \"string\", \"maxLength\": 5}'"
 at_fn_check_prepare_trace "ovsdb-types.at:62"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "string", "maxLength": 5}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158866,13 +159608,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_976
-#AT_START_977
-at_fn_group_banner 977 'ovsdb-types.at:62' \
+#AT_STOP_979
+#AT_START_980
+at_fn_group_banner 980 'ovsdb-types.at:62' \
   "string maxLength - Python" "                      " 59
 at_xfail=no
 (
-  $as_echo "977. $at_setup_line: testing $at_desc ..."
+  $as_echo "980. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:62" >"$at_check_line_file"
@@ -158884,7 +159626,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:62: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"string\", \"maxLength\": 5}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"string\", \"maxLength\": 5}'" "ovsdb-types.at:62"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "string", "maxLength": 5}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158899,13 +159641,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_977
-#AT_START_978
-at_fn_group_banner 978 'ovsdb-types.at:65' \
+#AT_STOP_980
+#AT_START_981
+at_fn_group_banner 981 'ovsdb-types.at:65' \
   "string minLength and maxLength - C" "             " 59
 at_xfail=no
 (
-  $as_echo "978. $at_setup_line: testing $at_desc ..."
+  $as_echo "981. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158913,7 +159655,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:65: test-ovsdb parse-base-type '{\"type\": \"string\", \"minLength\": 1, \"maxLength\": 5}'"
 at_fn_check_prepare_trace "ovsdb-types.at:65"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "string", "minLength": 1, "maxLength": 5}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158928,13 +159670,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_978
-#AT_START_979
-at_fn_group_banner 979 'ovsdb-types.at:65' \
+#AT_STOP_981
+#AT_START_982
+at_fn_group_banner 982 'ovsdb-types.at:65' \
   "string minLength and maxLength - Python" "        " 59
 at_xfail=no
 (
-  $as_echo "979. $at_setup_line: testing $at_desc ..."
+  $as_echo "982. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:65" >"$at_check_line_file"
@@ -158946,7 +159688,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:65: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"string\", \"minLength\": 1, \"maxLength\": 5}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"string\", \"minLength\": 1, \"maxLength\": 5}'" "ovsdb-types.at:65"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "string", "minLength": 1, "maxLength": 5}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -158961,13 +159703,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_979
-#AT_START_980
-at_fn_group_banner 980 'ovsdb-types.at:68' \
+#AT_STOP_982
+#AT_START_983
+at_fn_group_banner 983 'ovsdb-types.at:68' \
   "maxLength must not be less than minLength - C" "  " 59
 at_xfail=no
 (
-  $as_echo "980. $at_setup_line: testing $at_desc ..."
+  $as_echo "983. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -158975,7 +159717,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:68: test-ovsdb parse-base-type '{\"type\": \"string\", \"minLength\": 5, \"maxLength\": 3}'"
 at_fn_check_prepare_trace "ovsdb-types.at:68"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "string", "minLength": 5, "maxLength": 3}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -158999,7 +159741,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -159012,13 +159754,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_980
-#AT_START_981
-at_fn_group_banner 981 'ovsdb-types.at:68' \
+#AT_STOP_983
+#AT_START_984
+at_fn_group_banner 984 'ovsdb-types.at:68' \
   "maxLength must not be less than minLength - Python" "" 59
 at_xfail=no
 (
-  $as_echo "981. $at_setup_line: testing $at_desc ..."
+  $as_echo "984. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:68" >"$at_check_line_file"
@@ -159029,7 +159771,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:68: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"string\", \"minLength\": 5, \"maxLength\": 3}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"string\", \"minLength\": 5, \"maxLength\": 3}'" "ovsdb-types.at:68"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "string", "minLength": 5, "maxLength": 3}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -159053,7 +159795,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -159066,13 +159808,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_981
-#AT_START_982
-at_fn_group_banner 982 'ovsdb-types.at:71' \
+#AT_STOP_984
+#AT_START_985
+at_fn_group_banner 985 'ovsdb-types.at:71' \
   "maxLength must not be negative - C" "             " 59
 at_xfail=no
 (
-  $as_echo "982. $at_setup_line: testing $at_desc ..."
+  $as_echo "985. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159080,7 +159822,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:71: test-ovsdb parse-base-type '{\"type\": \"string\", \"maxLength\": -1}'"
 at_fn_check_prepare_trace "ovsdb-types.at:71"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "string", "maxLength": -1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -159104,7 +159846,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -159117,13 +159859,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_982
-#AT_START_983
-at_fn_group_banner 983 'ovsdb-types.at:71' \
+#AT_STOP_985
+#AT_START_986
+at_fn_group_banner 986 'ovsdb-types.at:71' \
   "maxLength must not be negative - Python" "        " 59
 at_xfail=no
 (
-  $as_echo "983. $at_setup_line: testing $at_desc ..."
+  $as_echo "986. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:71" >"$at_check_line_file"
@@ -159134,7 +159876,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:71: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"string\", \"maxLength\": -1}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"string\", \"maxLength\": -1}'" "ovsdb-types.at:71"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "string", "maxLength": -1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -159158,7 +159900,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -159171,13 +159913,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_983
-#AT_START_984
-at_fn_group_banner 984 'ovsdb-types.at:75' \
+#AT_STOP_986
+#AT_START_987
+at_fn_group_banner 987 'ovsdb-types.at:75' \
   "uuid enum - C" "                                  " 59
 at_xfail=no
 (
-  $as_echo "984. $at_setup_line: testing $at_desc ..."
+  $as_echo "987. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159185,7 +159927,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:75: test-ovsdb parse-base-type '{\"type\": \"uuid\", \"enum\": [\"uuid\", \"36bf19c0-ad9d-4232-bb85-b3d73dfe2123\"]}' "
 at_fn_check_prepare_trace "ovsdb-types.at:75"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "uuid", "enum": ["uuid", "36bf19c0-ad9d-4232-bb85-b3d73dfe2123"]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159200,13 +159942,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_984
-#AT_START_985
-at_fn_group_banner 985 'ovsdb-types.at:75' \
+#AT_STOP_987
+#AT_START_988
+at_fn_group_banner 988 'ovsdb-types.at:75' \
   "uuid enum - Python" "                             " 59
 at_xfail=no
 (
-  $as_echo "985. $at_setup_line: testing $at_desc ..."
+  $as_echo "988. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:75" >"$at_check_line_file"
@@ -159218,7 +159960,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:75: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"uuid\", \"enum\": [\"uuid\", \"36bf19c0-ad9d-4232-bb85-b3d73dfe2123\"]}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"uuid\", \"enum\": [\"uuid\", \"36bf19c0-ad9d-4232-bb85-b3d73dfe2123\"]}' " "ovsdb-types.at:75"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "uuid", "enum": ["uuid", "36bf19c0-ad9d-4232-bb85-b3d73dfe2123"]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159233,13 +159975,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_985
-#AT_START_986
-at_fn_group_banner 986 'ovsdb-types.at:78' \
+#AT_STOP_988
+#AT_START_989
+at_fn_group_banner 989 'ovsdb-types.at:78' \
   "uuid refTable - C" "                              " 59
 at_xfail=no
 (
-  $as_echo "986. $at_setup_line: testing $at_desc ..."
+  $as_echo "989. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159247,7 +159989,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:78: test-ovsdb parse-base-type '{\"type\": \"uuid\", \"refTable\": \"myTable\"}' "
 at_fn_check_prepare_trace "ovsdb-types.at:78"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "uuid", "refTable": "myTable"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159262,13 +160004,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_986
-#AT_START_987
-at_fn_group_banner 987 'ovsdb-types.at:78' \
+#AT_STOP_989
+#AT_START_990
+at_fn_group_banner 990 'ovsdb-types.at:78' \
   "uuid refTable - Python" "                         " 59
 at_xfail=no
 (
-  $as_echo "987. $at_setup_line: testing $at_desc ..."
+  $as_echo "990. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:78" >"$at_check_line_file"
@@ -159280,7 +160022,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:78: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"uuid\", \"refTable\": \"myTable\"}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"uuid\", \"refTable\": \"myTable\"}' " "ovsdb-types.at:78"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "uuid", "refTable": "myTable"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159295,13 +160037,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_987
-#AT_START_988
-at_fn_group_banner 988 'ovsdb-types.at:81' \
+#AT_STOP_990
+#AT_START_991
+at_fn_group_banner 991 'ovsdb-types.at:81' \
   "uuid refTable must be valid id - C" "             " 59
 at_xfail=no
 (
-  $as_echo "988. $at_setup_line: testing $at_desc ..."
+  $as_echo "991. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159309,7 +160051,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:81: test-ovsdb parse-base-type '{\"type\": \"uuid\", \"refTable\": \"a-b-c\"}' "
 at_fn_check_prepare_trace "ovsdb-types.at:81"
 ( $at_check_trace; test-ovsdb parse-base-type '{"type": "uuid", "refTable": "a-b-c"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -159333,7 +160075,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -159346,13 +160088,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_988
-#AT_START_989
-at_fn_group_banner 989 'ovsdb-types.at:81' \
+#AT_STOP_991
+#AT_START_992
+at_fn_group_banner 992 'ovsdb-types.at:81' \
   "uuid refTable must be valid id - Python" "        " 59
 at_xfail=no
 (
-  $as_echo "989. $at_setup_line: testing $at_desc ..."
+  $as_echo "992. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:81" >"$at_check_line_file"
@@ -159363,7 +160105,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:81: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{\"type\": \"uuid\", \"refTable\": \"a-b-c\"}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{\"type\": \"uuid\", \"refTable\": \"a-b-c\"}' " "ovsdb-types.at:81"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{"type": "uuid", "refTable": "a-b-c"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -159387,7 +160129,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -159400,13 +160142,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_989
-#AT_START_990
-at_fn_group_banner 990 'ovsdb-types.at:85' \
+#AT_STOP_992
+#AT_START_993
+at_fn_group_banner 993 'ovsdb-types.at:85' \
   "void is not a valid base-type - C" "              " 59
 at_xfail=no
 (
-  $as_echo "990. $at_setup_line: testing $at_desc ..."
+  $as_echo "993. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159414,7 +160156,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:85: test-ovsdb parse-base-type '[\"void\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:85"
 ( $at_check_trace; test-ovsdb parse-base-type '["void"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -159438,7 +160180,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -159451,13 +160193,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_990
-#AT_START_991
-at_fn_group_banner 991 'ovsdb-types.at:85' \
+#AT_STOP_993
+#AT_START_994
+at_fn_group_banner 994 'ovsdb-types.at:85' \
   "void is not a valid base-type - Python" "         " 59
 at_xfail=no
 (
-  $as_echo "991. $at_setup_line: testing $at_desc ..."
+  $as_echo "994. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:85" >"$at_check_line_file"
@@ -159468,7 +160210,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:85: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '[\"void\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '[\"void\"]' " "ovsdb-types.at:85"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '["void"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -159492,7 +160234,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -159505,13 +160247,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_991
-#AT_START_992
-at_fn_group_banner 992 'ovsdb-types.at:87' \
+#AT_STOP_994
+#AT_START_995
+at_fn_group_banner 995 'ovsdb-types.at:87' \
   "\"type\" member must be present - C" "              " 59
 at_xfail=no
 (
-  $as_echo "992. $at_setup_line: testing $at_desc ..."
+  $as_echo "995. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159519,7 +160261,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:87: test-ovsdb parse-base-type '{}'"
 at_fn_check_prepare_trace "ovsdb-types.at:87"
 ( $at_check_trace; test-ovsdb parse-base-type '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -159543,7 +160285,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -159556,13 +160298,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_992
-#AT_START_993
-at_fn_group_banner 993 'ovsdb-types.at:87' \
+#AT_STOP_995
+#AT_START_996
+at_fn_group_banner 996 'ovsdb-types.at:87' \
   "\"type\" member must be present - Python" "         " 59
 at_xfail=no
 (
-  $as_echo "993. $at_setup_line: testing $at_desc ..."
+  $as_echo "996. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:87" >"$at_check_line_file"
@@ -159573,7 +160315,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:87: \$PYTHON \$srcdir/test-ovsdb.py parse-base-type '{}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-base-type '{}'" "ovsdb-types.at:87"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-base-type '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -159597,7 +160339,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -159610,13 +160352,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_993
-#AT_START_994
-at_fn_group_banner 994 'ovsdb-types.at:92' \
+#AT_STOP_996
+#AT_START_997
+at_fn_group_banner 997 'ovsdb-types.at:92' \
   "simple integer - C" "                             " 60
 at_xfail=no
 (
-  $as_echo "994. $at_setup_line: testing $at_desc ..."
+  $as_echo "997. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159624,7 +160366,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:92: test-ovsdb parse-type '[\"integer\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:92"
 ( $at_check_trace; test-ovsdb parse-type '["integer"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159639,13 +160381,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_994
-#AT_START_995
-at_fn_group_banner 995 'ovsdb-types.at:92' \
+#AT_STOP_997
+#AT_START_998
+at_fn_group_banner 998 'ovsdb-types.at:92' \
   "simple integer - Python" "                        " 60
 at_xfail=no
 (
-  $as_echo "995. $at_setup_line: testing $at_desc ..."
+  $as_echo "998. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:92" >"$at_check_line_file"
@@ -159657,7 +160399,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:92: \$PYTHON \$srcdir/test-ovsdb.py parse-type '[\"integer\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '[\"integer\"]' " "ovsdb-types.at:92"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '["integer"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159672,13 +160414,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_995
-#AT_START_996
-at_fn_group_banner 996 'ovsdb-types.at:94' \
+#AT_STOP_998
+#AT_START_999
+at_fn_group_banner 999 'ovsdb-types.at:94' \
   "simple real - C" "                                " 60
 at_xfail=no
 (
-  $as_echo "996. $at_setup_line: testing $at_desc ..."
+  $as_echo "999. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159686,7 +160428,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:94: test-ovsdb parse-type '[\"real\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:94"
 ( $at_check_trace; test-ovsdb parse-type '["real"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159701,13 +160443,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_996
-#AT_START_997
-at_fn_group_banner 997 'ovsdb-types.at:94' \
+#AT_STOP_999
+#AT_START_1000
+at_fn_group_banner 1000 'ovsdb-types.at:94' \
   "simple real - Python" "                           " 60
 at_xfail=no
 (
-  $as_echo "997. $at_setup_line: testing $at_desc ..."
+  $as_echo "1000. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:94" >"$at_check_line_file"
@@ -159719,7 +160461,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:94: \$PYTHON \$srcdir/test-ovsdb.py parse-type '[\"real\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '[\"real\"]' " "ovsdb-types.at:94"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '["real"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159734,13 +160476,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_997
-#AT_START_998
-at_fn_group_banner 998 'ovsdb-types.at:96' \
+#AT_STOP_1000
+#AT_START_1001
+at_fn_group_banner 1001 'ovsdb-types.at:96' \
   "simple boolean - C" "                             " 60
 at_xfail=no
 (
-  $as_echo "998. $at_setup_line: testing $at_desc ..."
+  $as_echo "1001. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159748,7 +160490,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:96: test-ovsdb parse-type '[\"boolean\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:96"
 ( $at_check_trace; test-ovsdb parse-type '["boolean"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159763,13 +160505,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_998
-#AT_START_999
-at_fn_group_banner 999 'ovsdb-types.at:96' \
+#AT_STOP_1001
+#AT_START_1002
+at_fn_group_banner 1002 'ovsdb-types.at:96' \
   "simple boolean - Python" "                        " 60
 at_xfail=no
 (
-  $as_echo "999. $at_setup_line: testing $at_desc ..."
+  $as_echo "1002. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:96" >"$at_check_line_file"
@@ -159781,7 +160523,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:96: \$PYTHON \$srcdir/test-ovsdb.py parse-type '[\"boolean\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '[\"boolean\"]' " "ovsdb-types.at:96"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '["boolean"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159796,13 +160538,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_999
-#AT_START_1000
-at_fn_group_banner 1000 'ovsdb-types.at:98' \
+#AT_STOP_1002
+#AT_START_1003
+at_fn_group_banner 1003 'ovsdb-types.at:98' \
   "simple string - C" "                              " 60
 at_xfail=no
 (
-  $as_echo "1000. $at_setup_line: testing $at_desc ..."
+  $as_echo "1003. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159810,7 +160552,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:98: test-ovsdb parse-type '[\"string\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:98"
 ( $at_check_trace; test-ovsdb parse-type '["string"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159825,13 +160567,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1000
-#AT_START_1001
-at_fn_group_banner 1001 'ovsdb-types.at:98' \
+#AT_STOP_1003
+#AT_START_1004
+at_fn_group_banner 1004 'ovsdb-types.at:98' \
   "simple string - Python" "                         " 60
 at_xfail=no
 (
-  $as_echo "1001. $at_setup_line: testing $at_desc ..."
+  $as_echo "1004. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:98" >"$at_check_line_file"
@@ -159843,7 +160585,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:98: \$PYTHON \$srcdir/test-ovsdb.py parse-type '[\"string\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '[\"string\"]' " "ovsdb-types.at:98"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '["string"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159858,13 +160600,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1001
-#AT_START_1002
-at_fn_group_banner 1002 'ovsdb-types.at:100' \
+#AT_STOP_1004
+#AT_START_1005
+at_fn_group_banner 1005 'ovsdb-types.at:100' \
   "simple uuid - C" "                                " 60
 at_xfail=no
 (
-  $as_echo "1002. $at_setup_line: testing $at_desc ..."
+  $as_echo "1005. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159872,7 +160614,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:100: test-ovsdb parse-type '[\"uuid\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:100"
 ( $at_check_trace; test-ovsdb parse-type '["uuid"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159887,13 +160629,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1002
-#AT_START_1003
-at_fn_group_banner 1003 'ovsdb-types.at:100' \
+#AT_STOP_1005
+#AT_START_1006
+at_fn_group_banner 1006 'ovsdb-types.at:100' \
   "simple uuid - Python" "                           " 60
 at_xfail=no
 (
-  $as_echo "1003. $at_setup_line: testing $at_desc ..."
+  $as_echo "1006. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:100" >"$at_check_line_file"
@@ -159905,7 +160647,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:100: \$PYTHON \$srcdir/test-ovsdb.py parse-type '[\"uuid\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '[\"uuid\"]' " "ovsdb-types.at:100"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '["uuid"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159920,13 +160662,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1003
-#AT_START_1004
-at_fn_group_banner 1004 'ovsdb-types.at:102' \
+#AT_STOP_1006
+#AT_START_1007
+at_fn_group_banner 1007 'ovsdb-types.at:102' \
   "integer in object - C" "                          " 60
 at_xfail=no
 (
-  $as_echo "1004. $at_setup_line: testing $at_desc ..."
+  $as_echo "1007. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159934,7 +160676,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:102: test-ovsdb parse-type '{\"key\": \"integer\"}' "
 at_fn_check_prepare_trace "ovsdb-types.at:102"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "integer"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159949,13 +160691,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1004
-#AT_START_1005
-at_fn_group_banner 1005 'ovsdb-types.at:102' \
+#AT_STOP_1007
+#AT_START_1008
+at_fn_group_banner 1008 'ovsdb-types.at:102' \
   "integer in object - Python" "                     " 60
 at_xfail=no
 (
-  $as_echo "1005. $at_setup_line: testing $at_desc ..."
+  $as_echo "1008. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:102" >"$at_check_line_file"
@@ -159967,7 +160709,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:102: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"integer\"}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"integer\"}' " "ovsdb-types.at:102"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "integer"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -159982,13 +160724,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1005
-#AT_START_1006
-at_fn_group_banner 1006 'ovsdb-types.at:104' \
+#AT_STOP_1008
+#AT_START_1009
+at_fn_group_banner 1009 'ovsdb-types.at:104' \
   "real in object with explicit min and max - C" "   " 60
 at_xfail=no
 (
-  $as_echo "1006. $at_setup_line: testing $at_desc ..."
+  $as_echo "1009. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -159996,7 +160738,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:104: test-ovsdb parse-type '{\"key\": \"real\", \"min\": 1, \"max\": 1}' "
 at_fn_check_prepare_trace "ovsdb-types.at:104"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "real", "min": 1, "max": 1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -160011,13 +160753,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1006
-#AT_START_1007
-at_fn_group_banner 1007 'ovsdb-types.at:104' \
+#AT_STOP_1009
+#AT_START_1010
+at_fn_group_banner 1010 'ovsdb-types.at:104' \
   "real in object with explicit min and max - Python" "" 60
 at_xfail=no
 (
-  $as_echo "1007. $at_setup_line: testing $at_desc ..."
+  $as_echo "1010. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:104" >"$at_check_line_file"
@@ -160029,7 +160771,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:104: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"min\": 1, \"max\": 1}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"min\": 1, \"max\": 1}' " "ovsdb-types.at:104"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "real", "min": 1, "max": 1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -160044,13 +160786,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1007
-#AT_START_1008
-at_fn_group_banner 1008 'ovsdb-types.at:107' \
+#AT_STOP_1010
+#AT_START_1011
+at_fn_group_banner 1011 'ovsdb-types.at:107' \
   "key type is required - C" "                       " 60
 at_xfail=no
 (
-  $as_echo "1008. $at_setup_line: testing $at_desc ..."
+  $as_echo "1011. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -160058,7 +160800,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:107: test-ovsdb parse-type '{}' "
 at_fn_check_prepare_trace "ovsdb-types.at:107"
 ( $at_check_trace; test-ovsdb parse-type '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -160082,7 +160824,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -160095,13 +160837,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1008
-#AT_START_1009
-at_fn_group_banner 1009 'ovsdb-types.at:107' \
+#AT_STOP_1011
+#AT_START_1012
+at_fn_group_banner 1012 'ovsdb-types.at:107' \
   "key type is required - Python" "                  " 60
 at_xfail=no
 (
-  $as_echo "1009. $at_setup_line: testing $at_desc ..."
+  $as_echo "1012. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:107" >"$at_check_line_file"
@@ -160112,7 +160854,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:107: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{}' " "ovsdb-types.at:107"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -160136,7 +160878,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -160149,13 +160891,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1009
-#AT_START_1010
-at_fn_group_banner 1010 'ovsdb-types.at:109' \
+#AT_STOP_1012
+#AT_START_1013
+at_fn_group_banner 1013 'ovsdb-types.at:109' \
   "void is not a valid type - C" "                   " 60
 at_xfail=no
 (
-  $as_echo "1010. $at_setup_line: testing $at_desc ..."
+  $as_echo "1013. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -160163,7 +160905,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:109: test-ovsdb parse-type '[\"void\"]' "
 at_fn_check_prepare_trace "ovsdb-types.at:109"
 ( $at_check_trace; test-ovsdb parse-type '["void"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -160187,7 +160929,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -160200,13 +160942,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1010
-#AT_START_1011
-at_fn_group_banner 1011 'ovsdb-types.at:109' \
+#AT_STOP_1013
+#AT_START_1014
+at_fn_group_banner 1014 'ovsdb-types.at:109' \
   "void is not a valid type - Python" "              " 60
 at_xfail=no
 (
-  $as_echo "1011. $at_setup_line: testing $at_desc ..."
+  $as_echo "1014. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:109" >"$at_check_line_file"
@@ -160217,7 +160959,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:109: \$PYTHON \$srcdir/test-ovsdb.py parse-type '[\"void\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '[\"void\"]' " "ovsdb-types.at:109"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '["void"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -160241,7 +160983,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -160254,13 +160996,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1011
-#AT_START_1012
-at_fn_group_banner 1012 'ovsdb-types.at:114' \
+#AT_STOP_1014
+#AT_START_1015
+at_fn_group_banner 1015 'ovsdb-types.at:114' \
   "optional boolean - C" "                           " 61
 at_xfail=no
 (
-  $as_echo "1012. $at_setup_line: testing $at_desc ..."
+  $as_echo "1015. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -160268,7 +161010,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:114: test-ovsdb parse-type '{\"key\": \"boolean\", \"min\": 0}' "
 at_fn_check_prepare_trace "ovsdb-types.at:114"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "boolean", "min": 0}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -160283,13 +161025,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1012
-#AT_START_1013
-at_fn_group_banner 1013 'ovsdb-types.at:114' \
+#AT_STOP_1015
+#AT_START_1016
+at_fn_group_banner 1016 'ovsdb-types.at:114' \
   "optional boolean - Python" "                      " 61
 at_xfail=no
 (
-  $as_echo "1013. $at_setup_line: testing $at_desc ..."
+  $as_echo "1016. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:114" >"$at_check_line_file"
@@ -160301,7 +161043,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:114: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"boolean\", \"min\": 0}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"boolean\", \"min\": 0}' " "ovsdb-types.at:114"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "boolean", "min": 0}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -160316,13 +161058,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1013
-#AT_START_1014
-at_fn_group_banner 1014 'ovsdb-types.at:118' \
+#AT_STOP_1016
+#AT_START_1017
+at_fn_group_banner 1017 'ovsdb-types.at:118' \
   "set of 1 to 3 uuids - C" "                        " 61
 at_xfail=no
 (
-  $as_echo "1014. $at_setup_line: testing $at_desc ..."
+  $as_echo "1017. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -160330,7 +161072,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:118: test-ovsdb parse-type '{\"key\": \"uuid\", \"min\": 1, \"max\": 3}' "
 at_fn_check_prepare_trace "ovsdb-types.at:118"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "uuid", "min": 1, "max": 3}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -160345,13 +161087,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1014
-#AT_START_1015
-at_fn_group_banner 1015 'ovsdb-types.at:118' \
+#AT_STOP_1017
+#AT_START_1018
+at_fn_group_banner 1018 'ovsdb-types.at:118' \
   "set of 1 to 3 uuids - Python" "                   " 61
 at_xfail=no
 (
-  $as_echo "1015. $at_setup_line: testing $at_desc ..."
+  $as_echo "1018. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:118" >"$at_check_line_file"
@@ -160363,7 +161105,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:118: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"uuid\", \"min\": 1, \"max\": 3}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"uuid\", \"min\": 1, \"max\": 3}' " "ovsdb-types.at:118"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "uuid", "min": 1, "max": 3}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -160378,13 +161120,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1015
-#AT_START_1016
-at_fn_group_banner 1016 'ovsdb-types.at:121' \
+#AT_STOP_1018
+#AT_START_1019
+at_fn_group_banner 1019 'ovsdb-types.at:121' \
   "set of 0 to 3 strings - C" "                      " 61
 at_xfail=no
 (
-  $as_echo "1016. $at_setup_line: testing $at_desc ..."
+  $as_echo "1019. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -160392,7 +161134,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:121: test-ovsdb parse-type '{\"key\": \"string\", \"min\": 0, \"max\": 3}' "
 at_fn_check_prepare_trace "ovsdb-types.at:121"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "string", "min": 0, "max": 3}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -160407,13 +161149,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1016
-#AT_START_1017
-at_fn_group_banner 1017 'ovsdb-types.at:121' \
+#AT_STOP_1019
+#AT_START_1020
+at_fn_group_banner 1020 'ovsdb-types.at:121' \
   "set of 0 to 3 strings - Python" "                 " 61
 at_xfail=no
 (
-  $as_echo "1017. $at_setup_line: testing $at_desc ..."
+  $as_echo "1020. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:121" >"$at_check_line_file"
@@ -160425,7 +161167,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:121: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"string\", \"min\": 0, \"max\": 3}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"string\", \"min\": 0, \"max\": 3}' " "ovsdb-types.at:121"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "string", "min": 0, "max": 3}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -160440,13 +161182,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1017
-#AT_START_1018
-at_fn_group_banner 1018 'ovsdb-types.at:124' \
+#AT_STOP_1020
+#AT_START_1021
+at_fn_group_banner 1021 'ovsdb-types.at:124' \
   "set of 0 or more integers - C" "                  " 61
 at_xfail=no
 (
-  $as_echo "1018. $at_setup_line: testing $at_desc ..."
+  $as_echo "1021. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -160454,7 +161196,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:124: test-ovsdb parse-type '{\"key\": \"integer\", \"min\": 0, \"max\": \"unlimited\"}'"
 at_fn_check_prepare_trace "ovsdb-types.at:124"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "integer", "min": 0, "max": "unlimited"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -160469,13 +161211,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1018
-#AT_START_1019
-at_fn_group_banner 1019 'ovsdb-types.at:124' \
+#AT_STOP_1021
+#AT_START_1022
+at_fn_group_banner 1022 'ovsdb-types.at:124' \
   "set of 0 or more integers - Python" "             " 61
 at_xfail=no
 (
-  $as_echo "1019. $at_setup_line: testing $at_desc ..."
+  $as_echo "1022. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:124" >"$at_check_line_file"
@@ -160487,7 +161229,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:124: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"integer\", \"min\": 0, \"max\": \"unlimited\"}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"integer\", \"min\": 0, \"max\": \"unlimited\"}'" "ovsdb-types.at:124"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "integer", "min": 0, "max": "unlimited"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -160502,13 +161244,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1019
-#AT_START_1020
-at_fn_group_banner 1020 'ovsdb-types.at:127' \
+#AT_STOP_1022
+#AT_START_1023
+at_fn_group_banner 1023 'ovsdb-types.at:127' \
   "set of 1 or more reals - C" "                     " 61
 at_xfail=no
 (
-  $as_echo "1020. $at_setup_line: testing $at_desc ..."
+  $as_echo "1023. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -160516,7 +161258,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:127: test-ovsdb parse-type '{\"key\": \"real\", \"min\": 1, \"max\": \"unlimited\"}'"
 at_fn_check_prepare_trace "ovsdb-types.at:127"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "real", "min": 1, "max": "unlimited"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -160531,13 +161273,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1020
-#AT_START_1021
-at_fn_group_banner 1021 'ovsdb-types.at:127' \
+#AT_STOP_1023
+#AT_START_1024
+at_fn_group_banner 1024 'ovsdb-types.at:127' \
   "set of 1 or more reals - Python" "                " 61
 at_xfail=no
 (
-  $as_echo "1021. $at_setup_line: testing $at_desc ..."
+  $as_echo "1024. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:127" >"$at_check_line_file"
@@ -160549,7 +161291,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:127: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"min\": 1, \"max\": \"unlimited\"}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"min\": 1, \"max\": \"unlimited\"}'" "ovsdb-types.at:127"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "real", "min": 1, "max": "unlimited"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -160564,13 +161306,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1021
-#AT_START_1022
-at_fn_group_banner 1022 'ovsdb-types.at:131' \
+#AT_STOP_1024
+#AT_START_1025
+at_fn_group_banner 1025 'ovsdb-types.at:131' \
   "set max cannot be less than min - C" "            " 61
 at_xfail=no
 (
-  $as_echo "1022. $at_setup_line: testing $at_desc ..."
+  $as_echo "1025. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -160578,7 +161320,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:131: test-ovsdb parse-type '{\"key\": \"real\", \"min\": 5, \"max\": 3}' "
 at_fn_check_prepare_trace "ovsdb-types.at:131"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "real", "min": 5, "max": 3}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -160602,7 +161344,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -160615,13 +161357,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1022
-#AT_START_1023
-at_fn_group_banner 1023 'ovsdb-types.at:131' \
+#AT_STOP_1025
+#AT_START_1026
+at_fn_group_banner 1026 'ovsdb-types.at:131' \
   "set max cannot be less than min - Python" "       " 61
 at_xfail=no
 (
-  $as_echo "1023. $at_setup_line: testing $at_desc ..."
+  $as_echo "1026. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:131" >"$at_check_line_file"
@@ -160632,7 +161374,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:131: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"min\": 5, \"max\": 3}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"min\": 5, \"max\": 3}' " "ovsdb-types.at:131"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "real", "min": 5, "max": 3}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -160656,7 +161398,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -160669,13 +161411,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1023
-#AT_START_1024
-at_fn_group_banner 1024 'ovsdb-types.at:134' \
+#AT_STOP_1026
+#AT_START_1027
+at_fn_group_banner 1027 'ovsdb-types.at:134' \
   "set max cannot be negative - C" "                 " 61
 at_xfail=no
 (
-  $as_echo "1024. $at_setup_line: testing $at_desc ..."
+  $as_echo "1027. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -160683,7 +161425,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:134: test-ovsdb parse-type '{\"key\": \"real\", \"max\": -1}' "
 at_fn_check_prepare_trace "ovsdb-types.at:134"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "real", "max": -1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -160707,7 +161449,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -160720,13 +161462,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1024
-#AT_START_1025
-at_fn_group_banner 1025 'ovsdb-types.at:134' \
+#AT_STOP_1027
+#AT_START_1028
+at_fn_group_banner 1028 'ovsdb-types.at:134' \
   "set max cannot be negative - Python" "            " 61
 at_xfail=no
 (
-  $as_echo "1025. $at_setup_line: testing $at_desc ..."
+  $as_echo "1028. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:134" >"$at_check_line_file"
@@ -160737,7 +161479,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:134: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"max\": -1}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"max\": -1}' " "ovsdb-types.at:134"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "real", "max": -1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -160761,7 +161503,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -160774,13 +161516,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1025
-#AT_START_1026
-at_fn_group_banner 1026 'ovsdb-types.at:137' \
+#AT_STOP_1028
+#AT_START_1029
+at_fn_group_banner 1029 'ovsdb-types.at:137' \
   "set min cannot be negative - C" "                 " 61
 at_xfail=no
 (
-  $as_echo "1026. $at_setup_line: testing $at_desc ..."
+  $as_echo "1029. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -160788,7 +161530,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:137: test-ovsdb parse-type '{\"key\": \"real\", \"min\": -1}' "
 at_fn_check_prepare_trace "ovsdb-types.at:137"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "real", "min": -1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -160812,7 +161554,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -160825,13 +161567,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1026
-#AT_START_1027
-at_fn_group_banner 1027 'ovsdb-types.at:137' \
+#AT_STOP_1029
+#AT_START_1030
+at_fn_group_banner 1030 'ovsdb-types.at:137' \
   "set min cannot be negative - Python" "            " 61
 at_xfail=no
 (
-  $as_echo "1027. $at_setup_line: testing $at_desc ..."
+  $as_echo "1030. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:137" >"$at_check_line_file"
@@ -160842,7 +161584,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:137: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"min\": -1}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"min\": -1}' " "ovsdb-types.at:137"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "real", "min": -1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -160866,7 +161608,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -160879,13 +161621,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1027
-#AT_START_1028
-at_fn_group_banner 1028 'ovsdb-types.at:140' \
+#AT_STOP_1030
+#AT_START_1031
+at_fn_group_banner 1031 'ovsdb-types.at:140' \
   "set min cannot be greater than one - C" "         " 61
 at_xfail=no
 (
-  $as_echo "1028. $at_setup_line: testing $at_desc ..."
+  $as_echo "1031. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -160893,7 +161635,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:140: test-ovsdb parse-type '{\"key\": \"real\", \"min\": 10, \"max\": \"unlimited\"}'"
 at_fn_check_prepare_trace "ovsdb-types.at:140"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "real", "min": 10, "max": "unlimited"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -160917,7 +161659,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -160930,13 +161672,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1028
-#AT_START_1029
-at_fn_group_banner 1029 'ovsdb-types.at:140' \
+#AT_STOP_1031
+#AT_START_1032
+at_fn_group_banner 1032 'ovsdb-types.at:140' \
   "set min cannot be greater than one - Python" "    " 61
 at_xfail=no
 (
-  $as_echo "1029. $at_setup_line: testing $at_desc ..."
+  $as_echo "1032. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:140" >"$at_check_line_file"
@@ -160947,7 +161689,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:140: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"min\": 10, \"max\": \"unlimited\"}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"min\": 10, \"max\": \"unlimited\"}'" "ovsdb-types.at:140"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "real", "min": 10, "max": "unlimited"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -160971,7 +161713,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -160984,13 +161726,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1029
-#AT_START_1030
-at_fn_group_banner 1030 'ovsdb-types.at:146' \
+#AT_STOP_1032
+#AT_START_1033
+at_fn_group_banner 1033 'ovsdb-types.at:146' \
   "map of 1 integer to boolean - C" "                " 62
 at_xfail=no
 (
-  $as_echo "1030. $at_setup_line: testing $at_desc ..."
+  $as_echo "1033. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -160998,7 +161740,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:146: test-ovsdb parse-type '{\"key\": \"integer\", \"value\": \"boolean\"}' "
 at_fn_check_prepare_trace "ovsdb-types.at:146"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "integer", "value": "boolean"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161013,13 +161755,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1030
-#AT_START_1031
-at_fn_group_banner 1031 'ovsdb-types.at:146' \
+#AT_STOP_1033
+#AT_START_1034
+at_fn_group_banner 1034 'ovsdb-types.at:146' \
   "map of 1 integer to boolean - Python" "           " 62
 at_xfail=no
 (
-  $as_echo "1031. $at_setup_line: testing $at_desc ..."
+  $as_echo "1034. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:146" >"$at_check_line_file"
@@ -161031,7 +161773,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:146: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"integer\", \"value\": \"boolean\"}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"integer\", \"value\": \"boolean\"}' " "ovsdb-types.at:146"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "integer", "value": "boolean"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161046,13 +161788,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1031
-#AT_START_1032
-at_fn_group_banner 1032 'ovsdb-types.at:149' \
+#AT_STOP_1034
+#AT_START_1035
+at_fn_group_banner 1035 'ovsdb-types.at:149' \
   "map of 1 boolean to integer, explicit min and max - C" "" 62
 at_xfail=no
 (
-  $as_echo "1032. $at_setup_line: testing $at_desc ..."
+  $as_echo "1035. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -161060,7 +161802,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:149: test-ovsdb parse-type '{\"key\": \"boolean\", \"value\": \"integer\", \"min\": 1, \"max\": 1}' "
 at_fn_check_prepare_trace "ovsdb-types.at:149"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "boolean", "value": "integer", "min": 1, "max": 1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161075,13 +161817,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1032
-#AT_START_1033
-at_fn_group_banner 1033 'ovsdb-types.at:149' \
+#AT_STOP_1035
+#AT_START_1036
+at_fn_group_banner 1036 'ovsdb-types.at:149' \
   "map of 1 boolean to integer, explicit min and max - Python" "" 62
 at_xfail=no
 (
-  $as_echo "1033. $at_setup_line: testing $at_desc ..."
+  $as_echo "1036. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:149" >"$at_check_line_file"
@@ -161093,7 +161835,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:149: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"boolean\", \"value\": \"integer\", \"min\": 1, \"max\": 1}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"boolean\", \"value\": \"integer\", \"min\": 1, \"max\": 1}' " "ovsdb-types.at:149"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "boolean", "value": "integer", "min": 1, "max": 1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161108,13 +161850,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1033
-#AT_START_1034
-at_fn_group_banner 1034 'ovsdb-types.at:152' \
+#AT_STOP_1036
+#AT_START_1037
+at_fn_group_banner 1037 'ovsdb-types.at:152' \
   "map of 1 to 5 uuid to real - C" "                 " 62
 at_xfail=no
 (
-  $as_echo "1034. $at_setup_line: testing $at_desc ..."
+  $as_echo "1037. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -161122,7 +161864,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:152: test-ovsdb parse-type '{\"key\": \"uuid\", \"value\": \"real\", \"min\": 1, \"max\": 5}' "
 at_fn_check_prepare_trace "ovsdb-types.at:152"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "uuid", "value": "real", "min": 1, "max": 5}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161137,13 +161879,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1034
-#AT_START_1035
-at_fn_group_banner 1035 'ovsdb-types.at:152' \
+#AT_STOP_1037
+#AT_START_1038
+at_fn_group_banner 1038 'ovsdb-types.at:152' \
   "map of 1 to 5 uuid to real - Python" "            " 62
 at_xfail=no
 (
-  $as_echo "1035. $at_setup_line: testing $at_desc ..."
+  $as_echo "1038. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:152" >"$at_check_line_file"
@@ -161155,7 +161897,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:152: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"uuid\", \"value\": \"real\", \"min\": 1, \"max\": 5}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"uuid\", \"value\": \"real\", \"min\": 1, \"max\": 5}' " "ovsdb-types.at:152"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "uuid", "value": "real", "min": 1, "max": 5}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161170,13 +161912,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1035
-#AT_START_1036
-at_fn_group_banner 1036 'ovsdb-types.at:155' \
+#AT_STOP_1038
+#AT_START_1039
+at_fn_group_banner 1039 'ovsdb-types.at:155' \
   "map of 0 to 10 string to uuid - C" "              " 62
 at_xfail=no
 (
-  $as_echo "1036. $at_setup_line: testing $at_desc ..."
+  $as_echo "1039. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -161184,7 +161926,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:155: test-ovsdb parse-type '{\"key\": \"string\", \"value\": \"uuid\", \"min\": 0, \"max\": 10}' "
 at_fn_check_prepare_trace "ovsdb-types.at:155"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "string", "value": "uuid", "min": 0, "max": 10}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161199,13 +161941,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1036
-#AT_START_1037
-at_fn_group_banner 1037 'ovsdb-types.at:155' \
+#AT_STOP_1039
+#AT_START_1040
+at_fn_group_banner 1040 'ovsdb-types.at:155' \
   "map of 0 to 10 string to uuid - Python" "         " 62
 at_xfail=no
 (
-  $as_echo "1037. $at_setup_line: testing $at_desc ..."
+  $as_echo "1040. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:155" >"$at_check_line_file"
@@ -161217,7 +161959,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:155: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"string\", \"value\": \"uuid\", \"min\": 0, \"max\": 10}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"string\", \"value\": \"uuid\", \"min\": 0, \"max\": 10}' " "ovsdb-types.at:155"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "string", "value": "uuid", "min": 0, "max": 10}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161232,13 +161974,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1037
-#AT_START_1038
-at_fn_group_banner 1038 'ovsdb-types.at:158' \
+#AT_STOP_1040
+#AT_START_1041
+at_fn_group_banner 1041 'ovsdb-types.at:158' \
   "map of 1 to 20 real to string - C" "              " 62
 at_xfail=no
 (
-  $as_echo "1038. $at_setup_line: testing $at_desc ..."
+  $as_echo "1041. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -161246,7 +161988,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:158: test-ovsdb parse-type '{\"key\": \"real\", \"value\": \"string\", \"min\": 1, \"max\": 20}' "
 at_fn_check_prepare_trace "ovsdb-types.at:158"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "real", "value": "string", "min": 1, "max": 20}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161261,13 +162003,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1038
-#AT_START_1039
-at_fn_group_banner 1039 'ovsdb-types.at:158' \
+#AT_STOP_1041
+#AT_START_1042
+at_fn_group_banner 1042 'ovsdb-types.at:158' \
   "map of 1 to 20 real to string - Python" "         " 62
 at_xfail=no
 (
-  $as_echo "1039. $at_setup_line: testing $at_desc ..."
+  $as_echo "1042. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:158" >"$at_check_line_file"
@@ -161279,7 +162021,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:158: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"value\": \"string\", \"min\": 1, \"max\": 20}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"real\", \"value\": \"string\", \"min\": 1, \"max\": 20}' " "ovsdb-types.at:158"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "real", "value": "string", "min": 1, "max": 20}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161294,13 +162036,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1039
-#AT_START_1040
-at_fn_group_banner 1040 'ovsdb-types.at:161' \
+#AT_STOP_1042
+#AT_START_1043
+at_fn_group_banner 1043 'ovsdb-types.at:161' \
   "map of 0 or more string to real - C" "            " 62
 at_xfail=no
 (
-  $as_echo "1040. $at_setup_line: testing $at_desc ..."
+  $as_echo "1043. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -161308,7 +162050,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:161: test-ovsdb parse-type '{\"key\": \"string\", \"value\": \"real\", \"min\": 0, \"max\": \"unlimited\"}' "
 at_fn_check_prepare_trace "ovsdb-types.at:161"
 ( $at_check_trace; test-ovsdb parse-type '{"key": "string", "value": "real", "min": 0, "max": "unlimited"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161323,13 +162065,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1040
-#AT_START_1041
-at_fn_group_banner 1041 'ovsdb-types.at:161' \
+#AT_STOP_1043
+#AT_START_1044
+at_fn_group_banner 1044 'ovsdb-types.at:161' \
   "map of 0 or more string to real - Python" "       " 62
 at_xfail=no
 (
-  $as_echo "1041. $at_setup_line: testing $at_desc ..."
+  $as_echo "1044. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:161" >"$at_check_line_file"
@@ -161341,7 +162083,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:161: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"key\": \"string\", \"value\": \"real\", \"min\": 0, \"max\": \"unlimited\"}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"key\": \"string\", \"value\": \"real\", \"min\": 0, \"max\": \"unlimited\"}' " "ovsdb-types.at:161"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"key": "string", "value": "real", "min": 0, "max": "unlimited"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161356,13 +162098,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1041
-#AT_START_1042
-at_fn_group_banner 1042 'ovsdb-types.at:165' \
+#AT_STOP_1044
+#AT_START_1045
+at_fn_group_banner 1045 'ovsdb-types.at:165' \
   "map key type is required - C" "                   " 62
 at_xfail=no
 (
-  $as_echo "1042. $at_setup_line: testing $at_desc ..."
+  $as_echo "1045. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -161370,7 +162112,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:165: test-ovsdb parse-type '{\"value\": \"integer\"}' "
 at_fn_check_prepare_trace "ovsdb-types.at:165"
 ( $at_check_trace; test-ovsdb parse-type '{"value": "integer"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -161394,7 +162136,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -161407,13 +162149,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1042
-#AT_START_1043
-at_fn_group_banner 1043 'ovsdb-types.at:165' \
+#AT_STOP_1045
+#AT_START_1046
+at_fn_group_banner 1046 'ovsdb-types.at:165' \
   "map key type is required - Python" "              " 62
 at_xfail=no
 (
-  $as_echo "1043. $at_setup_line: testing $at_desc ..."
+  $as_echo "1046. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-types.at:165" >"$at_check_line_file"
@@ -161424,7 +162166,7 @@
 $as_echo "$at_srcdir/ovsdb-types.at:165: \$PYTHON \$srcdir/test-ovsdb.py parse-type '{\"value\": \"integer\"}' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-type '{\"value\": \"integer\"}' " "ovsdb-types.at:165"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-type '{"value": "integer"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -161448,7 +162190,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -161461,13 +162203,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1043
-#AT_START_1044
-at_fn_group_banner 1044 'ovsdb-data.at:3' \
+#AT_STOP_1046
+#AT_START_1047
+at_fn_group_banner 1047 'ovsdb-data.at:3' \
   "default atoms - C" "                              " 63
 at_xfail=no
 (
-  $as_echo "1044. $at_setup_line: testing $at_desc ..."
+  $as_echo "1047. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -161475,7 +162217,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:3: test-ovsdb default-atoms"
 at_fn_check_prepare_trace "ovsdb-data.at:3"
 ( $at_check_trace; test-ovsdb default-atoms
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161494,13 +162236,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1044
-#AT_START_1045
-at_fn_group_banner 1045 'ovsdb-data.at:3' \
+#AT_STOP_1047
+#AT_START_1048
+at_fn_group_banner 1048 'ovsdb-data.at:3' \
   "default atoms - Python" "                         " 63
 at_xfail=no
 (
-  $as_echo "1045. $at_setup_line: testing $at_desc ..."
+  $as_echo "1048. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:3" >"$at_check_line_file"
@@ -161512,7 +162254,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:3: \$PYTHON \$srcdir/test-ovsdb.py default-atoms"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py default-atoms" "ovsdb-data.at:3"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py default-atoms
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161531,13 +162273,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1045
-#AT_START_1046
-at_fn_group_banner 1046 'ovsdb-data.at:11' \
+#AT_STOP_1048
+#AT_START_1049
+at_fn_group_banner 1049 'ovsdb-data.at:11' \
   "default data - C" "                               " 63
 at_xfail=no
 (
-  $as_echo "1046. $at_setup_line: testing $at_desc ..."
+  $as_echo "1049. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -161545,7 +162287,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:11: test-ovsdb default-data"
 at_fn_check_prepare_trace "ovsdb-data.at:11"
 ( $at_check_trace; test-ovsdb default-data
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161619,13 +162361,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1046
-#AT_START_1047
-at_fn_group_banner 1047 'ovsdb-data.at:11' \
+#AT_STOP_1049
+#AT_START_1050
+at_fn_group_banner 1050 'ovsdb-data.at:11' \
   "default data - Python" "                          " 63
 at_xfail=no
 (
-  $as_echo "1047. $at_setup_line: testing $at_desc ..."
+  $as_echo "1050. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:11" >"$at_check_line_file"
@@ -161637,7 +162379,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:11: \$PYTHON \$srcdir/test-ovsdb.py default-data"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py default-data" "ovsdb-data.at:11"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py default-data
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161711,13 +162453,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1047
-#AT_START_1048
-at_fn_group_banner 1048 'ovsdb-data.at:76' \
+#AT_STOP_1050
+#AT_START_1051
+at_fn_group_banner 1051 'ovsdb-data.at:76' \
   "integer atom from JSON - C" "                     " 64
 at_xfail=no
 (
-  $as_echo "1048. $at_setup_line: testing $at_desc ..."
+  $as_echo "1051. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -161735,7 +162477,7 @@
     '[1e3]' \
     '[9223372036854775807]' \
     '[-9223372036854775808]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161754,13 +162496,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1048
-#AT_START_1049
-at_fn_group_banner 1049 'ovsdb-data.at:76' \
+#AT_STOP_1051
+#AT_START_1052
+at_fn_group_banner 1052 'ovsdb-data.at:76' \
   "integer atom from JSON - Python" "                " 64
 at_xfail=no
 (
-  $as_echo "1049. $at_setup_line: testing $at_desc ..."
+  $as_echo "1052. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:76" >"$at_check_line_file"
@@ -161782,7 +162524,7 @@
     '[1e3]' \
     '[9223372036854775807]' \
     '[-9223372036854775808]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161801,13 +162543,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1049
-#AT_START_1050
-at_fn_group_banner 1050 'ovsdb-data.at:89' \
+#AT_STOP_1052
+#AT_START_1053
+at_fn_group_banner 1053 'ovsdb-data.at:89' \
   "integer atom from string" "                       " 64
 at_xfail=no
 (
-  $as_echo "1050. $at_setup_line: testing $at_desc ..."
+  $as_echo "1053. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -161825,7 +162567,7 @@
     '+1000' \
     '9223372036854775807' \
     '-9223372036854775808'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161844,13 +162586,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1050
-#AT_START_1051
-at_fn_group_banner 1051 'ovsdb-data.at:102' \
+#AT_STOP_1053
+#AT_START_1054
+at_fn_group_banner 1054 'ovsdb-data.at:102' \
   "real atom from JSON - C" "                        " 64
 at_xfail=no
 (
-  $as_echo "1051. $at_setup_line: testing $at_desc ..."
+  $as_echo "1054. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -161872,7 +162614,7 @@
     '[1e3]' \
     '[1e37]' \
     '[0.00390625]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161893,13 +162635,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1051
-#AT_START_1052
-at_fn_group_banner 1052 'ovsdb-data.at:102' \
+#AT_STOP_1054
+#AT_START_1055
+at_fn_group_banner 1055 'ovsdb-data.at:102' \
   "real atom from JSON - Python" "                   " 64
 at_xfail=no
 (
-  $as_echo "1052. $at_setup_line: testing $at_desc ..."
+  $as_echo "1055. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:102" >"$at_check_line_file"
@@ -161925,7 +162667,7 @@
     '[1e3]' \
     '[1e37]' \
     '[0.00390625]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161946,13 +162688,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1052
-#AT_START_1053
-at_fn_group_banner 1053 'ovsdb-data.at:119' \
+#AT_STOP_1055
+#AT_START_1056
+at_fn_group_banner 1056 'ovsdb-data.at:119' \
   "real atom from string" "                          " 64
 at_xfail=no
 (
-  $as_echo "1053. $at_setup_line: testing $at_desc ..."
+  $as_echo "1056. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -161974,7 +162716,7 @@
     '1e3' \
     '1e37' \
     '0.00390625'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -161995,13 +162737,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1053
-#AT_START_1054
-at_fn_group_banner 1054 'ovsdb-data.at:136' \
+#AT_STOP_1056
+#AT_START_1057
+at_fn_group_banner 1057 'ovsdb-data.at:136' \
   "boolean atom from JSON - C" "                     " 64
 at_xfail=no
 (
-  $as_echo "1054. $at_setup_line: testing $at_desc ..."
+  $as_echo "1057. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162009,7 +162751,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:136: test-ovsdb parse-atoms '[\"boolean\"]' '[true]' '[false]' "
 at_fn_check_prepare_trace "ovsdb-data.at:136"
 ( $at_check_trace; test-ovsdb parse-atoms '["boolean"]' '[true]' '[false]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162025,13 +162767,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1054
-#AT_START_1055
-at_fn_group_banner 1055 'ovsdb-data.at:136' \
+#AT_STOP_1057
+#AT_START_1058
+at_fn_group_banner 1058 'ovsdb-data.at:136' \
   "boolean atom from JSON - Python" "                " 64
 at_xfail=no
 (
-  $as_echo "1055. $at_setup_line: testing $at_desc ..."
+  $as_echo "1058. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:136" >"$at_check_line_file"
@@ -162043,7 +162785,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:136: \$PYTHON \$srcdir/test-ovsdb.py parse-atoms '[\"boolean\"]' '[true]' '[false]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atoms '[\"boolean\"]' '[true]' '[false]' " "ovsdb-data.at:136"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atoms '["boolean"]' '[true]' '[false]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162059,13 +162801,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1055
-#AT_START_1056
-at_fn_group_banner 1056 'ovsdb-data.at:141' \
+#AT_STOP_1058
+#AT_START_1059
+at_fn_group_banner 1059 'ovsdb-data.at:141' \
   "boolean atom from string" "                       " 64
 at_xfail=no
 (
-  $as_echo "1056. $at_setup_line: testing $at_desc ..."
+  $as_echo "1059. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162073,7 +162815,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:141: test-ovsdb parse-atom-strings '[\"boolean\"]' 'true' 'false' "
 at_fn_check_prepare_trace "ovsdb-data.at:141"
 ( $at_check_trace; test-ovsdb parse-atom-strings '["boolean"]' 'true' 'false'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162089,13 +162831,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1056
-#AT_START_1057
-at_fn_group_banner 1057 'ovsdb-data.at:146' \
+#AT_STOP_1059
+#AT_START_1060
+at_fn_group_banner 1060 'ovsdb-data.at:146' \
   "string atom from JSON - C" "                      " 64
 at_xfail=no
 (
-  $as_echo "1057. $at_setup_line: testing $at_desc ..."
+  $as_echo "1060. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162103,7 +162845,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:146: test-ovsdb parse-atoms '[\"string\"]' '[\"\"]' '[\"true\"]' '[\"\\\"\\\\\\/\\b\\f\\n\\r\\t\"]'"
 at_fn_check_prepare_trace "ovsdb-data.at:146"
 ( $at_check_trace; test-ovsdb parse-atoms '["string"]' '[""]' '["true"]' '["\"\\\/\b\f\n\r\t"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162120,13 +162862,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1057
-#AT_START_1058
-at_fn_group_banner 1058 'ovsdb-data.at:146' \
+#AT_STOP_1060
+#AT_START_1061
+at_fn_group_banner 1061 'ovsdb-data.at:146' \
   "string atom from JSON - Python" "                 " 64
 at_xfail=no
 (
-  $as_echo "1058. $at_setup_line: testing $at_desc ..."
+  $as_echo "1061. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:146" >"$at_check_line_file"
@@ -162138,7 +162880,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:146: \$PYTHON \$srcdir/test-ovsdb.py parse-atoms '[\"string\"]' '[\"\"]' '[\"true\"]' '[\"\\\"\\\\\\/\\b\\f\\n\\r\\t\"]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atoms '[\"string\"]' '[\"\"]' '[\"true\"]' '[\"\\\"\\\\\\/\\b\\f\\n\\r\\t\"]'" "ovsdb-data.at:146"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atoms '["string"]' '[""]' '["true"]' '["\"\\\/\b\f\n\r\t"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162155,13 +162897,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1058
-#AT_START_1059
-at_fn_group_banner 1059 'ovsdb-data.at:152' \
+#AT_STOP_1061
+#AT_START_1062
+at_fn_group_banner 1062 'ovsdb-data.at:152' \
   "string atom from string" "                        " 64
 at_xfail=no
 (
-  $as_echo "1059. $at_setup_line: testing $at_desc ..."
+  $as_echo "1062. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162181,7 +162923,7 @@
     '""' \
     '"true"' \
     '"\"\\\/\b\f\n\r\t"'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162201,13 +162943,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1059
-#AT_START_1060
-at_fn_group_banner 1060 'ovsdb-data.at:167' \
+#AT_STOP_1062
+#AT_START_1063
+at_fn_group_banner 1063 'ovsdb-data.at:167' \
   "uuid atom from JSON - C" "                        " 64
 at_xfail=no
 (
-  $as_echo "1060. $at_setup_line: testing $at_desc ..."
+  $as_echo "1063. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162215,7 +162957,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:167: test-ovsdb parse-atoms '[\"uuid\"]' '[\"uuid\", \"550e8400-e29b-41d4-a716-446655440000\"]'"
 at_fn_check_prepare_trace "ovsdb-data.at:167"
 ( $at_check_trace; test-ovsdb parse-atoms '["uuid"]' '["uuid", "550e8400-e29b-41d4-a716-446655440000"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162230,13 +162972,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1060
-#AT_START_1061
-at_fn_group_banner 1061 'ovsdb-data.at:167' \
+#AT_STOP_1063
+#AT_START_1064
+at_fn_group_banner 1064 'ovsdb-data.at:167' \
   "uuid atom from JSON - Python" "                   " 64
 at_xfail=no
 (
-  $as_echo "1061. $at_setup_line: testing $at_desc ..."
+  $as_echo "1064. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:167" >"$at_check_line_file"
@@ -162248,7 +162990,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:167: \$PYTHON \$srcdir/test-ovsdb.py parse-atoms '[\"uuid\"]' '[\"uuid\", \"550e8400-e29b-41d4-a716-446655440000\"]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atoms '[\"uuid\"]' '[\"uuid\", \"550e8400-e29b-41d4-a716-446655440000\"]'" "ovsdb-data.at:167"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atoms '["uuid"]' '["uuid", "550e8400-e29b-41d4-a716-446655440000"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162263,13 +163005,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1061
-#AT_START_1062
-at_fn_group_banner 1062 'ovsdb-data.at:171' \
+#AT_STOP_1064
+#AT_START_1065
+at_fn_group_banner 1065 'ovsdb-data.at:171' \
   "uuid atom from string" "                          " 64
 at_xfail=no
 (
-  $as_echo "1062. $at_setup_line: testing $at_desc ..."
+  $as_echo "1065. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162277,7 +163019,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:171: test-ovsdb parse-atom-strings '[\"uuid\"]' '550e8400-e29b-41d4-a716-446655440000'"
 at_fn_check_prepare_trace "ovsdb-data.at:171"
 ( $at_check_trace; test-ovsdb parse-atom-strings '["uuid"]' '550e8400-e29b-41d4-a716-446655440000'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162292,13 +163034,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1062
-#AT_START_1063
-at_fn_group_banner 1063 'ovsdb-data.at:175' \
+#AT_STOP_1065
+#AT_START_1066
+at_fn_group_banner 1066 'ovsdb-data.at:175' \
   "integer atom sorting - C" "                       " 64
 at_xfail=no
 (
-  $as_echo "1063. $at_setup_line: testing $at_desc ..."
+  $as_echo "1066. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162306,7 +163048,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:175: test-ovsdb sort-atoms '[\"integer\"]' '[55,0,-1,2,1]'"
 at_fn_check_prepare_trace "ovsdb-data.at:175"
 ( $at_check_trace; test-ovsdb sort-atoms '["integer"]' '[55,0,-1,2,1]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162321,13 +163063,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1063
-#AT_START_1064
-at_fn_group_banner 1064 'ovsdb-data.at:175' \
+#AT_STOP_1066
+#AT_START_1067
+at_fn_group_banner 1067 'ovsdb-data.at:175' \
   "integer atom sorting - Python" "                  " 64
 at_xfail=no
 (
-  $as_echo "1064. $at_setup_line: testing $at_desc ..."
+  $as_echo "1067. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:175" >"$at_check_line_file"
@@ -162339,7 +163081,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:175: \$PYTHON \$srcdir/test-ovsdb.py sort-atoms '[\"integer\"]' '[55,0,-1,2,1]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py sort-atoms '[\"integer\"]' '[55,0,-1,2,1]'" "ovsdb-data.at:175"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py sort-atoms '["integer"]' '[55,0,-1,2,1]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162354,13 +163096,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1064
-#AT_START_1065
-at_fn_group_banner 1065 'ovsdb-data.at:179' \
+#AT_STOP_1067
+#AT_START_1068
+at_fn_group_banner 1068 'ovsdb-data.at:179' \
   "real atom sorting - C" "                          " 64
 at_xfail=no
 (
-  $as_echo "1065. $at_setup_line: testing $at_desc ..."
+  $as_echo "1068. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162368,7 +163110,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:179: test-ovsdb sort-atoms '[\"real\"]' '[1.25,1.23,0.0,-0.0,-1e99]'"
 at_fn_check_prepare_trace "ovsdb-data.at:179"
 ( $at_check_trace; test-ovsdb sort-atoms '["real"]' '[1.25,1.23,0.0,-0.0,-1e99]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162383,13 +163125,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1065
-#AT_START_1066
-at_fn_group_banner 1066 'ovsdb-data.at:179' \
+#AT_STOP_1068
+#AT_START_1069
+at_fn_group_banner 1069 'ovsdb-data.at:179' \
   "real atom sorting - Python" "                     " 64
 at_xfail=no
 (
-  $as_echo "1066. $at_setup_line: testing $at_desc ..."
+  $as_echo "1069. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:179" >"$at_check_line_file"
@@ -162401,7 +163143,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:179: \$PYTHON \$srcdir/test-ovsdb.py sort-atoms '[\"real\"]' '[1.25,1.23,0.0,-0.0,-1e99]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py sort-atoms '[\"real\"]' '[1.25,1.23,0.0,-0.0,-1e99]'" "ovsdb-data.at:179"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py sort-atoms '["real"]' '[1.25,1.23,0.0,-0.0,-1e99]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162416,13 +163158,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1066
-#AT_START_1067
-at_fn_group_banner 1067 'ovsdb-data.at:183' \
+#AT_STOP_1069
+#AT_START_1070
+at_fn_group_banner 1070 'ovsdb-data.at:183' \
   "boolean atom sorting - C" "                       " 64
 at_xfail=no
 (
-  $as_echo "1067. $at_setup_line: testing $at_desc ..."
+  $as_echo "1070. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162430,7 +163172,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:183: test-ovsdb sort-atoms '[\"boolean\"]' '[true,false,true,false,false]'"
 at_fn_check_prepare_trace "ovsdb-data.at:183"
 ( $at_check_trace; test-ovsdb sort-atoms '["boolean"]' '[true,false,true,false,false]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162445,13 +163187,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1067
-#AT_START_1068
-at_fn_group_banner 1068 'ovsdb-data.at:183' \
+#AT_STOP_1070
+#AT_START_1071
+at_fn_group_banner 1071 'ovsdb-data.at:183' \
   "boolean atom sorting - Python" "                  " 64
 at_xfail=no
 (
-  $as_echo "1068. $at_setup_line: testing $at_desc ..."
+  $as_echo "1071. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:183" >"$at_check_line_file"
@@ -162463,7 +163205,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:183: \$PYTHON \$srcdir/test-ovsdb.py sort-atoms '[\"boolean\"]' '[true,false,true,false,false]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py sort-atoms '[\"boolean\"]' '[true,false,true,false,false]'" "ovsdb-data.at:183"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py sort-atoms '["boolean"]' '[true,false,true,false,false]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162478,13 +163220,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1068
-#AT_START_1069
-at_fn_group_banner 1069 'ovsdb-data.at:187' \
+#AT_STOP_1071
+#AT_START_1072
+at_fn_group_banner 1072 'ovsdb-data.at:187' \
   "string atom sorting - C" "                        " 64
 at_xfail=no
 (
-  $as_echo "1069. $at_setup_line: testing $at_desc ..."
+  $as_echo "1072. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162492,7 +163234,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:187: test-ovsdb sort-atoms '[\"string\"]' '[\"abd\",\"abc\",\"\\b\",\"xxx\"]'"
 at_fn_check_prepare_trace "ovsdb-data.at:187"
 ( $at_check_trace; test-ovsdb sort-atoms '["string"]' '["abd","abc","\b","xxx"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162507,13 +163249,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1069
-#AT_START_1070
-at_fn_group_banner 1070 'ovsdb-data.at:187' \
+#AT_STOP_1072
+#AT_START_1073
+at_fn_group_banner 1073 'ovsdb-data.at:187' \
   "string atom sorting - Python" "                   " 64
 at_xfail=no
 (
-  $as_echo "1070. $at_setup_line: testing $at_desc ..."
+  $as_echo "1073. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:187" >"$at_check_line_file"
@@ -162525,7 +163267,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:187: \$PYTHON \$srcdir/test-ovsdb.py sort-atoms '[\"string\"]' '[\"abd\",\"abc\",\"\\b\",\"xxx\"]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py sort-atoms '[\"string\"]' '[\"abd\",\"abc\",\"\\b\",\"xxx\"]'" "ovsdb-data.at:187"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py sort-atoms '["string"]' '["abd","abc","\b","xxx"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162540,13 +163282,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1070
-#AT_START_1071
-at_fn_group_banner 1071 'ovsdb-data.at:191' \
+#AT_STOP_1073
+#AT_START_1074
+at_fn_group_banner 1074 'ovsdb-data.at:191' \
   "uuid atom sorting - C" "                          " 64
 at_xfail=no
 (
-  $as_echo "1071. $at_setup_line: testing $at_desc ..."
+  $as_echo "1074. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162620,7 +163362,7 @@
     ["uuid", "00000000-0001-0000-0000-000000000000"],
     ["uuid", "00000001-0000-0000-0000-000000000000"],
     ["uuid", "00001000-0000-0000-0000-000000000000"]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162635,13 +163377,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1071
-#AT_START_1072
-at_fn_group_banner 1072 'ovsdb-data.at:191' \
+#AT_STOP_1074
+#AT_START_1075
+at_fn_group_banner 1075 'ovsdb-data.at:191' \
   "uuid atom sorting - Python" "                     " 64
 at_xfail=no
 (
-  $as_echo "1072. $at_setup_line: testing $at_desc ..."
+  $as_echo "1075. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:191" >"$at_check_line_file"
@@ -162719,7 +163461,7 @@
     ["uuid", "00000000-0001-0000-0000-000000000000"],
     ["uuid", "00000001-0000-0000-0000-000000000000"],
     ["uuid", "00001000-0000-0000-0000-000000000000"]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162734,13 +163476,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1072
-#AT_START_1073
-at_fn_group_banner 1073 'ovsdb-data.at:228' \
+#AT_STOP_1075
+#AT_START_1076
+at_fn_group_banner 1076 'ovsdb-data.at:228' \
   "real not acceptable integer JSON atom - C" "      " 64
 at_xfail=no
 (
-  $as_echo "1073. $at_setup_line: testing $at_desc ..."
+  $as_echo "1076. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162748,7 +163490,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:228: test-ovsdb parse-atoms '[\"integer\"]' '[0.5]' "
 at_fn_check_prepare_trace "ovsdb-data.at:228"
 ( $at_check_trace; test-ovsdb parse-atoms '["integer"]' '[0.5]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162763,13 +163505,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1073
-#AT_START_1074
-at_fn_group_banner 1074 'ovsdb-data.at:228' \
+#AT_STOP_1076
+#AT_START_1077
+at_fn_group_banner 1077 'ovsdb-data.at:228' \
   "real not acceptable integer JSON atom - Python" " " 64
 at_xfail=no
 (
-  $as_echo "1074. $at_setup_line: testing $at_desc ..."
+  $as_echo "1077. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:228" >"$at_check_line_file"
@@ -162781,7 +163523,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:228: \$PYTHON \$srcdir/test-ovsdb.py parse-atoms '[\"integer\"]' '[0.5]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atoms '[\"integer\"]' '[0.5]' " "ovsdb-data.at:228"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atoms '["integer"]' '[0.5]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162796,13 +163538,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1074
-#AT_START_1075
-at_fn_group_banner 1075 'ovsdb-data.at:234' \
+#AT_STOP_1077
+#AT_START_1078
+at_fn_group_banner 1078 'ovsdb-data.at:234' \
   "no invalid UTF-8 sequences in strings" "          " 64
 at_xfail=no
 (
-  $as_echo "1075. $at_setup_line: testing $at_desc ..."
+  $as_echo "1078. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162816,7 +163558,7 @@
      '[""]' \
      '[""]' \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162832,13 +163574,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1075
-#AT_START_1076
-at_fn_group_banner 1076 'ovsdb-data.at:249' \
+#AT_STOP_1078
+#AT_START_1079
+at_fn_group_banner 1079 'ovsdb-data.at:249' \
   "no invalid UTF-8 sequences in strings - Python" " " 64
 at_xfail=no
 (
-  $as_echo "1076. $at_setup_line: testing $at_desc ..."
+  $as_echo "1079. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:249" >"$at_check_line_file"
@@ -162856,7 +163598,7 @@
      '[""]' \
      '[""]' \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162872,13 +163614,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1076
-#AT_START_1077
-at_fn_group_banner 1077 'ovsdb-data.at:257' \
+#AT_STOP_1079
+#AT_START_1080
+at_fn_group_banner 1080 'ovsdb-data.at:257' \
   "real not acceptable integer string atom" "        " 64
 at_xfail=no
 (
-  $as_echo "1077. $at_setup_line: testing $at_desc ..."
+  $as_echo "1080. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162886,7 +163628,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:257: test-ovsdb parse-atom-strings '[\"integer\"]' '0.5' "
 at_fn_check_prepare_trace "ovsdb-data.at:257"
 ( $at_check_trace; test-ovsdb parse-atom-strings '["integer"]' '0.5'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -162910,7 +163652,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -162923,13 +163665,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1077
-#AT_START_1078
-at_fn_group_banner 1078 'ovsdb-data.at:261' \
+#AT_STOP_1080
+#AT_START_1081
+at_fn_group_banner 1081 'ovsdb-data.at:261' \
   "string \"true\" not acceptable boolean JSON atom - C" "" 64
 at_xfail=no
 (
-  $as_echo "1078. $at_setup_line: testing $at_desc ..."
+  $as_echo "1081. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162937,7 +163679,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:261: test-ovsdb parse-atoms '[\"boolean\"]' '[\"true\"]' "
 at_fn_check_prepare_trace "ovsdb-data.at:261"
 ( $at_check_trace; test-ovsdb parse-atoms '["boolean"]' '["true"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162952,13 +163694,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1078
-#AT_START_1079
-at_fn_group_banner 1079 'ovsdb-data.at:261' \
+#AT_STOP_1081
+#AT_START_1082
+at_fn_group_banner 1082 'ovsdb-data.at:261' \
   "string \"true\" not acceptable boolean JSON atom - Python" "" 64
 at_xfail=no
 (
-  $as_echo "1079. $at_setup_line: testing $at_desc ..."
+  $as_echo "1082. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:261" >"$at_check_line_file"
@@ -162970,7 +163712,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:261: \$PYTHON \$srcdir/test-ovsdb.py parse-atoms '[\"boolean\"]' '[\"true\"]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atoms '[\"boolean\"]' '[\"true\"]' " "ovsdb-data.at:261"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atoms '["boolean"]' '["true"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -162985,13 +163727,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1079
-#AT_START_1080
-at_fn_group_banner 1080 'ovsdb-data.at:265' \
+#AT_STOP_1082
+#AT_START_1083
+at_fn_group_banner 1083 'ovsdb-data.at:265' \
   "string \"true\" not acceptable boolean string atom" "" 64
 at_xfail=no
 (
-  $as_echo "1080. $at_setup_line: testing $at_desc ..."
+  $as_echo "1083. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -162999,7 +163741,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:265: test-ovsdb parse-atom-strings '[\"boolean\"]' '\"true\"' "
 at_fn_check_prepare_trace "ovsdb-data.at:265"
 ( $at_check_trace; test-ovsdb parse-atom-strings '["boolean"]' '"true"'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -163023,7 +163765,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -163036,13 +163778,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1080
-#AT_START_1081
-at_fn_group_banner 1081 'ovsdb-data.at:269' \
+#AT_STOP_1083
+#AT_START_1084
+at_fn_group_banner 1084 'ovsdb-data.at:269' \
   "integer not acceptable string JSON atom - C" "    " 64
 at_xfail=no
 (
-  $as_echo "1081. $at_setup_line: testing $at_desc ..."
+  $as_echo "1084. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163050,7 +163792,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:269: test-ovsdb parse-atoms '[\"string\"]' '[1]'"
 at_fn_check_prepare_trace "ovsdb-data.at:269"
 ( $at_check_trace; test-ovsdb parse-atoms '["string"]' '[1]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163065,13 +163807,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1081
-#AT_START_1082
-at_fn_group_banner 1082 'ovsdb-data.at:269' \
+#AT_STOP_1084
+#AT_START_1085
+at_fn_group_banner 1085 'ovsdb-data.at:269' \
   "integer not acceptable string JSON atom - Python" "" 64
 at_xfail=no
 (
-  $as_echo "1082. $at_setup_line: testing $at_desc ..."
+  $as_echo "1085. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:269" >"$at_check_line_file"
@@ -163083,7 +163825,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:269: \$PYTHON \$srcdir/test-ovsdb.py parse-atoms '[\"string\"]' '[1]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atoms '[\"string\"]' '[1]'" "ovsdb-data.at:269"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atoms '["string"]' '[1]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163098,13 +163840,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1082
-#AT_START_1083
-at_fn_group_banner 1083 'ovsdb-data.at:273' \
+#AT_STOP_1085
+#AT_START_1086
+at_fn_group_banner 1086 'ovsdb-data.at:273' \
   "uuid atom must be expressed as JSON array - C" "  " 64
 at_xfail=no
 (
-  $as_echo "1083. $at_setup_line: testing $at_desc ..."
+  $as_echo "1086. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163112,7 +163854,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:273: test-ovsdb parse-atoms '[\"uuid\"]' '[\"550e8400-e29b-41d4-a716-446655440000\"]'"
 at_fn_check_prepare_trace "ovsdb-data.at:273"
 ( $at_check_trace; test-ovsdb parse-atoms '["uuid"]' '["550e8400-e29b-41d4-a716-446655440000"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163127,13 +163869,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1083
-#AT_START_1084
-at_fn_group_banner 1084 'ovsdb-data.at:273' \
+#AT_STOP_1086
+#AT_START_1087
+at_fn_group_banner 1087 'ovsdb-data.at:273' \
   "uuid atom must be expressed as JSON array - Python" "" 64
 at_xfail=no
 (
-  $as_echo "1084. $at_setup_line: testing $at_desc ..."
+  $as_echo "1087. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:273" >"$at_check_line_file"
@@ -163145,7 +163887,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:273: \$PYTHON \$srcdir/test-ovsdb.py parse-atoms '[\"uuid\"]' '[\"550e8400-e29b-41d4-a716-446655440000\"]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atoms '[\"uuid\"]' '[\"550e8400-e29b-41d4-a716-446655440000\"]'" "ovsdb-data.at:273"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atoms '["uuid"]' '["550e8400-e29b-41d4-a716-446655440000"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163160,13 +163902,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1084
-#AT_START_1085
-at_fn_group_banner 1085 'ovsdb-data.at:277' \
+#AT_STOP_1087
+#AT_START_1088
+at_fn_group_banner 1088 'ovsdb-data.at:277' \
   "named-uuid requires symbol table - C" "           " 64
 at_xfail=no
 (
-  $as_echo "1085. $at_setup_line: testing $at_desc ..."
+  $as_echo "1088. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163174,7 +163916,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:277: test-ovsdb parse-atoms '[\"uuid\"]' '[\"named-uuid\", \"x\"]'"
 at_fn_check_prepare_trace "ovsdb-data.at:277"
 ( $at_check_trace; test-ovsdb parse-atoms '["uuid"]' '["named-uuid", "x"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163189,13 +163931,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1085
-#AT_START_1086
-at_fn_group_banner 1086 'ovsdb-data.at:277' \
+#AT_STOP_1088
+#AT_START_1089
+at_fn_group_banner 1089 'ovsdb-data.at:277' \
   "named-uuid requires symbol table - Python" "      " 64
 at_xfail=no
 (
-  $as_echo "1086. $at_setup_line: testing $at_desc ..."
+  $as_echo "1089. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:277" >"$at_check_line_file"
@@ -163207,7 +163949,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:277: \$PYTHON \$srcdir/test-ovsdb.py parse-atoms '[\"uuid\"]' '[\"named-uuid\", \"x\"]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-atoms '[\"uuid\"]' '[\"named-uuid\", \"x\"]'" "ovsdb-data.at:277"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atoms '["uuid"]' '["named-uuid", "x"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163222,13 +163964,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1086
-#AT_START_1087
-at_fn_group_banner 1087 'ovsdb-data.at:281' \
+#AT_STOP_1089
+#AT_START_1090
+at_fn_group_banner 1090 'ovsdb-data.at:281' \
   "empty string atom must be quoted" "               " 64
 at_xfail=no
 (
-  $as_echo "1087. $at_setup_line: testing $at_desc ..."
+  $as_echo "1090. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163236,7 +163978,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:281: test-ovsdb parse-atom-strings '[\"string\"]' ''"
 at_fn_check_prepare_trace "ovsdb-data.at:281"
 ( $at_check_trace; test-ovsdb parse-atom-strings '["string"]' ''
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -163260,7 +164002,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -163273,13 +164015,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1087
-#AT_START_1088
-at_fn_group_banner 1088 'ovsdb-data.at:285' \
+#AT_STOP_1090
+#AT_START_1091
+at_fn_group_banner 1091 'ovsdb-data.at:285' \
   "quotes must be balanced" "                        " 64
 at_xfail=no
 (
-  $as_echo "1088. $at_setup_line: testing $at_desc ..."
+  $as_echo "1091. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163287,7 +164029,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:285: test-ovsdb parse-atom-strings '[\"string\"]' '\"asdf'"
 at_fn_check_prepare_trace "ovsdb-data.at:285"
 ( $at_check_trace; test-ovsdb parse-atom-strings '["string"]' '"asdf'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -163311,7 +164053,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -163324,13 +164066,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1088
-#AT_START_1089
-at_fn_group_banner 1089 'ovsdb-data.at:289' \
+#AT_STOP_1091
+#AT_START_1092
+at_fn_group_banner 1092 'ovsdb-data.at:289' \
   "quoted string must not contain unescaped quote" " " 64
 at_xfail=no
 (
-  $as_echo "1089. $at_setup_line: testing $at_desc ..."
+  $as_echo "1092. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163338,7 +164080,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:289: test-ovsdb parse-atom-strings '[\"string\"]' '\"as\"df\"'"
 at_fn_check_prepare_trace "ovsdb-data.at:289"
 ( $at_check_trace; test-ovsdb parse-atom-strings '["string"]' '"as"df"'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -163362,7 +164104,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -163375,13 +164117,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1089
-#AT_START_1090
-at_fn_group_banner 1090 'ovsdb-data.at:293' \
+#AT_STOP_1092
+#AT_START_1093
+at_fn_group_banner 1093 'ovsdb-data.at:293' \
   "quoted string must not end with backslash" "      " 64
 at_xfail=no
 (
-  $as_echo "1090. $at_setup_line: testing $at_desc ..."
+  $as_echo "1093. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163389,7 +164131,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:293: test-ovsdb parse-atom-strings '[\"string\"]' '\"asdf\\\"'"
 at_fn_check_prepare_trace "ovsdb-data.at:293"
 ( $at_check_trace; test-ovsdb parse-atom-strings '["string"]' '"asdf\"'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -163413,7 +164155,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -163426,13 +164168,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1090
-#AT_START_1091
-at_fn_group_banner 1091 'ovsdb-data.at:297' \
+#AT_STOP_1093
+#AT_START_1094
+at_fn_group_banner 1094 'ovsdb-data.at:297' \
   "uuids must be valid" "                            " 64
 at_xfail=no
 (
-  $as_echo "1091. $at_setup_line: testing $at_desc ..."
+  $as_echo "1094. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163440,7 +164182,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:297: test-ovsdb parse-atom-strings '[\"uuid\"]' '1234-5678'"
 at_fn_check_prepare_trace "ovsdb-data.at:297"
 ( $at_check_trace; test-ovsdb parse-atom-strings '["uuid"]' '1234-5678'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -163464,7 +164206,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -163477,13 +164219,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1091
-#AT_START_1092
-at_fn_group_banner 1092 'ovsdb-data.at:303' \
+#AT_STOP_1094
+#AT_START_1095
+at_fn_group_banner 1095 'ovsdb-data.at:303' \
   "integer atom enum - C" "                          " 65
 at_xfail=no
 (
-  $as_echo "1092. $at_setup_line: testing $at_desc ..."
+  $as_echo "1095. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163511,7 +164253,7 @@
     '[9]' \
     '[10]' \
     '[11]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163535,13 +164277,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1092
-#AT_START_1093
-at_fn_group_banner 1093 'ovsdb-data.at:303' \
+#AT_STOP_1095
+#AT_START_1096
+at_fn_group_banner 1096 'ovsdb-data.at:303' \
   "integer atom enum - Python" "                     " 65
 at_xfail=no
 (
-  $as_echo "1093. $at_setup_line: testing $at_desc ..."
+  $as_echo "1096. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:303" >"$at_check_line_file"
@@ -163573,7 +164315,7 @@
     '[9]' \
     '[10]' \
     '[11]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163597,13 +164339,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1093
-#AT_START_1094
-at_fn_group_banner 1094 'ovsdb-data.at:326' \
+#AT_STOP_1096
+#AT_START_1097
+at_fn_group_banner 1097 'ovsdb-data.at:326' \
   "real atom enum - C" "                             " 65
 at_xfail=no
 (
-  $as_echo "1094. $at_setup_line: testing $at_desc ..."
+  $as_echo "1097. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163625,7 +164367,7 @@
     '[1]' \
     '[1.5]' \
     '[2]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163646,13 +164388,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1094
-#AT_START_1095
-at_fn_group_banner 1095 'ovsdb-data.at:326' \
+#AT_STOP_1097
+#AT_START_1098
+at_fn_group_banner 1098 'ovsdb-data.at:326' \
   "real atom enum - Python" "                        " 65
 at_xfail=no
 (
-  $as_echo "1095. $at_setup_line: testing $at_desc ..."
+  $as_echo "1098. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:326" >"$at_check_line_file"
@@ -163678,7 +164420,7 @@
     '[1]' \
     '[1.5]' \
     '[2]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163699,13 +164441,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1095
-#AT_START_1096
-at_fn_group_banner 1096 'ovsdb-data.at:343' \
+#AT_STOP_1098
+#AT_START_1099
+at_fn_group_banner 1099 'ovsdb-data.at:343' \
   "boolean atom enum - C" "                          " 65
 at_xfail=no
 (
-  $as_echo "1096. $at_setup_line: testing $at_desc ..."
+  $as_echo "1099. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163717,7 +164459,7 @@
 ( $at_check_trace; test-ovsdb parse-atoms '[{"type": "boolean", "enum": false}]' \
     '[false]' \
     '[true]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163733,13 +164475,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1096
-#AT_START_1097
-at_fn_group_banner 1097 'ovsdb-data.at:343' \
+#AT_STOP_1099
+#AT_START_1100
+at_fn_group_banner 1100 'ovsdb-data.at:343' \
   "boolean atom enum - Python" "                     " 65
 at_xfail=no
 (
-  $as_echo "1097. $at_setup_line: testing $at_desc ..."
+  $as_echo "1100. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:343" >"$at_check_line_file"
@@ -163755,7 +164497,7 @@
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-atoms '[{"type": "boolean", "enum": false}]' \
     '[false]' \
     '[true]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163771,13 +164513,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1097
-#AT_START_1098
-at_fn_group_banner 1098 'ovsdb-data.at:350' \
+#AT_STOP_1100
+#AT_START_1101
+at_fn_group_banner 1101 'ovsdb-data.at:350' \
   "string atom enum - C" "                           " 65
 at_xfail=no
 (
-  $as_echo "1098. $at_setup_line: testing $at_desc ..."
+  $as_echo "1101. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163797,7 +164539,7 @@
     '["def"]' \
     '["defg"]' \
     '["DEF"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163817,13 +164559,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1098
-#AT_START_1099
-at_fn_group_banner 1099 'ovsdb-data.at:350' \
+#AT_STOP_1101
+#AT_START_1102
+at_fn_group_banner 1102 'ovsdb-data.at:350' \
   "string atom enum - Python" "                      " 65
 at_xfail=no
 (
-  $as_echo "1099. $at_setup_line: testing $at_desc ..."
+  $as_echo "1102. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:350" >"$at_check_line_file"
@@ -163847,7 +164589,7 @@
     '["def"]' \
     '["defg"]' \
     '["DEF"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163867,13 +164609,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1099
-#AT_START_1100
-at_fn_group_banner 1100 'ovsdb-data.at:365' \
+#AT_STOP_1102
+#AT_START_1103
+at_fn_group_banner 1103 'ovsdb-data.at:365' \
   "uuid atom enum - C" "                             " 65
 at_xfail=no
 (
-  $as_echo "1100. $at_setup_line: testing $at_desc ..."
+  $as_echo "1103. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163887,7 +164629,7 @@
     '["uuid", "6d53a6dd-2da7-4924-9927-97f613812382"]' \
     '["uuid", "52cbc842-137a-4db5-804f-9f34106a0ba3"]' \
     '["uuid", "dab2a6b2-6094-4f43-a7ef-4c0f0608f176"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163904,13 +164646,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1100
-#AT_START_1101
-at_fn_group_banner 1101 'ovsdb-data.at:365' \
+#AT_STOP_1103
+#AT_START_1104
+at_fn_group_banner 1104 'ovsdb-data.at:365' \
   "uuid atom enum - Python" "                        " 65
 at_xfail=no
 (
-  $as_echo "1101. $at_setup_line: testing $at_desc ..."
+  $as_echo "1104. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:365" >"$at_check_line_file"
@@ -163928,7 +164670,7 @@
     '["uuid", "6d53a6dd-2da7-4924-9927-97f613812382"]' \
     '["uuid", "52cbc842-137a-4db5-804f-9f34106a0ba3"]' \
     '["uuid", "dab2a6b2-6094-4f43-a7ef-4c0f0608f176"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163945,13 +164687,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1101
-#AT_START_1102
-at_fn_group_banner 1102 'ovsdb-data.at:376' \
+#AT_STOP_1104
+#AT_START_1105
+at_fn_group_banner 1105 'ovsdb-data.at:376' \
   "integers >= 5 - C" "                              " 66
 at_xfail=no
 (
-  $as_echo "1102. $at_setup_line: testing $at_desc ..."
+  $as_echo "1105. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -163969,7 +164711,7 @@
     '[5]' \
     '[6]' \
     '[12345]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -163988,13 +164730,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1102
-#AT_START_1103
-at_fn_group_banner 1103 'ovsdb-data.at:376' \
+#AT_STOP_1105
+#AT_START_1106
+at_fn_group_banner 1106 'ovsdb-data.at:376' \
   "integers >= 5 - Python" "                         " 66
 at_xfail=no
 (
-  $as_echo "1103. $at_setup_line: testing $at_desc ..."
+  $as_echo "1106. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:376" >"$at_check_line_file"
@@ -164016,7 +164758,7 @@
     '[5]' \
     '[6]' \
     '[12345]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164035,13 +164777,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1103
-#AT_START_1104
-at_fn_group_banner 1104 'ovsdb-data.at:389' \
+#AT_STOP_1106
+#AT_START_1107
+at_fn_group_banner 1107 'ovsdb-data.at:389' \
   "integers <= -1 - C" "                             " 66
 at_xfail=no
 (
-  $as_echo "1104. $at_setup_line: testing $at_desc ..."
+  $as_echo "1107. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164057,7 +164799,7 @@
     '[-1]' \
     '[-2]' \
     '[-123]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164075,13 +164817,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1104
-#AT_START_1105
-at_fn_group_banner 1105 'ovsdb-data.at:389' \
+#AT_STOP_1107
+#AT_START_1108
+at_fn_group_banner 1108 'ovsdb-data.at:389' \
   "integers <= -1 - Python" "                        " 66
 at_xfail=no
 (
-  $as_echo "1105. $at_setup_line: testing $at_desc ..."
+  $as_echo "1108. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:389" >"$at_check_line_file"
@@ -164101,7 +164843,7 @@
     '[-1]' \
     '[-2]' \
     '[-123]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164119,13 +164861,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1105
-#AT_START_1106
-at_fn_group_banner 1106 'ovsdb-data.at:400' \
+#AT_STOP_1108
+#AT_START_1109
+at_fn_group_banner 1109 'ovsdb-data.at:400' \
   "integers in range -10 to 10 - C" "                " 66
 at_xfail=no
 (
-  $as_echo "1106. $at_setup_line: testing $at_desc ..."
+  $as_echo "1109. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164151,7 +164893,7 @@
     '[10]' \
     '[11]' \
     '[123576]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164174,13 +164916,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1106
-#AT_START_1107
-at_fn_group_banner 1107 'ovsdb-data.at:400' \
+#AT_STOP_1109
+#AT_START_1110
+at_fn_group_banner 1110 'ovsdb-data.at:400' \
   "integers in range -10 to 10 - Python" "           " 66
 at_xfail=no
 (
-  $as_echo "1107. $at_setup_line: testing $at_desc ..."
+  $as_echo "1110. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:400" >"$at_check_line_file"
@@ -164210,7 +164952,7 @@
     '[10]' \
     '[11]' \
     '[123576]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164233,13 +164975,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1107
-#AT_START_1108
-at_fn_group_banner 1108 'ovsdb-data.at:421' \
+#AT_STOP_1110
+#AT_START_1111
+at_fn_group_banner 1111 'ovsdb-data.at:421' \
   "reals >= 5 - C" "                                 " 66
 at_xfail=no
 (
-  $as_echo "1108. $at_setup_line: testing $at_desc ..."
+  $as_echo "1111. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164257,7 +164999,7 @@
     '[5]' \
     '[6]' \
     '[12345]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164276,13 +165018,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1108
-#AT_START_1109
-at_fn_group_banner 1109 'ovsdb-data.at:421' \
+#AT_STOP_1111
+#AT_START_1112
+at_fn_group_banner 1112 'ovsdb-data.at:421' \
   "reals >= 5 - Python" "                            " 66
 at_xfail=no
 (
-  $as_echo "1109. $at_setup_line: testing $at_desc ..."
+  $as_echo "1112. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:421" >"$at_check_line_file"
@@ -164304,7 +165046,7 @@
     '[5]' \
     '[6]' \
     '[12345]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164323,13 +165065,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1109
-#AT_START_1110
-at_fn_group_banner 1110 'ovsdb-data.at:434' \
+#AT_STOP_1112
+#AT_START_1113
+at_fn_group_banner 1113 'ovsdb-data.at:434' \
   "reals <= -1 - C" "                                " 66
 at_xfail=no
 (
-  $as_echo "1110. $at_setup_line: testing $at_desc ..."
+  $as_echo "1113. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164345,7 +165087,7 @@
     '[-1]' \
     '[-2]' \
     '[-123]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164363,13 +165105,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1110
-#AT_START_1111
-at_fn_group_banner 1111 'ovsdb-data.at:434' \
+#AT_STOP_1113
+#AT_START_1114
+at_fn_group_banner 1114 'ovsdb-data.at:434' \
   "reals <= -1 - Python" "                           " 66
 at_xfail=no
 (
-  $as_echo "1111. $at_setup_line: testing $at_desc ..."
+  $as_echo "1114. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:434" >"$at_check_line_file"
@@ -164389,7 +165131,7 @@
     '[-1]' \
     '[-2]' \
     '[-123]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164407,13 +165149,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1111
-#AT_START_1112
-at_fn_group_banner 1112 'ovsdb-data.at:445' \
+#AT_STOP_1114
+#AT_START_1115
+at_fn_group_banner 1115 'ovsdb-data.at:445' \
   "reals in range -10 to 10 - C" "                   " 66
 at_xfail=no
 (
-  $as_echo "1112. $at_setup_line: testing $at_desc ..."
+  $as_echo "1115. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164439,7 +165181,7 @@
     '[10]' \
     '[11]' \
     '[123576]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164462,13 +165204,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1112
-#AT_START_1113
-at_fn_group_banner 1113 'ovsdb-data.at:445' \
+#AT_STOP_1115
+#AT_START_1116
+at_fn_group_banner 1116 'ovsdb-data.at:445' \
   "reals in range -10 to 10 - Python" "              " 66
 at_xfail=no
 (
-  $as_echo "1113. $at_setup_line: testing $at_desc ..."
+  $as_echo "1116. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:445" >"$at_check_line_file"
@@ -164498,7 +165240,7 @@
     '[10]' \
     '[11]' \
     '[123576]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164521,13 +165263,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1113
-#AT_START_1114
-at_fn_group_banner 1114 'ovsdb-data.at:466' \
+#AT_STOP_1116
+#AT_START_1117
+at_fn_group_banner 1117 'ovsdb-data.at:466' \
   "strings at least 2 characters long - C" "         " 66
 at_xfail=no
 (
-  $as_echo "1114. $at_setup_line: testing $at_desc ..."
+  $as_echo "1117. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164545,7 +165287,7 @@
     '["ab"]' \
     '["abc"]' \
     '["\ud834\udd1e"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164564,13 +165306,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1114
-#AT_START_1115
-at_fn_group_banner 1115 'ovsdb-data.at:466' \
+#AT_STOP_1117
+#AT_START_1118
+at_fn_group_banner 1118 'ovsdb-data.at:466' \
   "strings at least 2 characters long - Python" "    " 66
 at_xfail=no
 (
-  $as_echo "1115. $at_setup_line: testing $at_desc ..."
+  $as_echo "1118. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:466" >"$at_check_line_file"
@@ -164580,7 +165322,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:466: \$PYTHON -c 'unichr(0x10000)' || exit 77"
 at_fn_check_prepare_dynamic "$PYTHON -c 'unichr(0x10000)' || exit 77" "ovsdb-data.at:466"
 ( $at_check_trace; $PYTHON -c 'unichr(0x10000)' || exit 77
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -164604,7 +165346,7 @@
     '["ab"]' \
     '["abc"]' \
     '["\ud834\udd1e"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164623,13 +165365,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1115
-#AT_START_1116
-at_fn_group_banner 1116 'ovsdb-data.at:484' \
+#AT_STOP_1118
+#AT_START_1119
+at_fn_group_banner 1119 'ovsdb-data.at:484' \
   "strings no more than 2 characters long - C" "     " 66
 at_xfail=no
 (
-  $as_echo "1116. $at_setup_line: testing $at_desc ..."
+  $as_echo "1119. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164647,7 +165389,7 @@
     '["ab"]' \
     '["abc"]' \
     '["de"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164666,13 +165408,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1116
-#AT_START_1117
-at_fn_group_banner 1117 'ovsdb-data.at:484' \
+#AT_STOP_1119
+#AT_START_1120
+at_fn_group_banner 1120 'ovsdb-data.at:484' \
   "strings no more than 2 characters long - Python" "" 66
 at_xfail=no
 (
-  $as_echo "1117. $at_setup_line: testing $at_desc ..."
+  $as_echo "1120. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:484" >"$at_check_line_file"
@@ -164694,7 +165436,7 @@
     '["ab"]' \
     '["abc"]' \
     '["de"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164713,13 +165455,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1117
-#AT_START_1118
-at_fn_group_banner 1118 'ovsdb-data.at:499' \
+#AT_STOP_1120
+#AT_START_1121
+at_fn_group_banner 1121 'ovsdb-data.at:499' \
   "integer JSON datum - C" "                         " 67
 at_xfail=no
 (
-  $as_echo "1118. $at_setup_line: testing $at_desc ..."
+  $as_echo "1121. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164727,7 +165469,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:499: test-ovsdb parse-data '[\"integer\"]' '[0]' '[\"set\",[1]]' '[-1]'"
 at_fn_check_prepare_trace "ovsdb-data.at:499"
 ( $at_check_trace; test-ovsdb parse-data '["integer"]' '[0]' '["set",[1]]' '[-1]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164744,13 +165486,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1118
-#AT_START_1119
-at_fn_group_banner 1119 'ovsdb-data.at:499' \
+#AT_STOP_1121
+#AT_START_1122
+at_fn_group_banner 1122 'ovsdb-data.at:499' \
   "integer JSON datum - Python" "                    " 67
 at_xfail=no
 (
-  $as_echo "1119. $at_setup_line: testing $at_desc ..."
+  $as_echo "1122. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:499" >"$at_check_line_file"
@@ -164762,7 +165504,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:499: \$PYTHON \$srcdir/test-ovsdb.py parse-data '[\"integer\"]' '[0]' '[\"set\",[1]]' '[-1]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-data '[\"integer\"]' '[0]' '[\"set\",[1]]' '[-1]'" "ovsdb-data.at:499"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-data '["integer"]' '[0]' '["set",[1]]' '[-1]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164779,13 +165521,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1119
-#AT_START_1120
-at_fn_group_banner 1120 'ovsdb-data.at:505' \
+#AT_STOP_1122
+#AT_START_1123
+at_fn_group_banner 1123 'ovsdb-data.at:505' \
   "integer string datum" "                           " 67
 at_xfail=no
 (
-  $as_echo "1120. $at_setup_line: testing $at_desc ..."
+  $as_echo "1123. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164793,7 +165535,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:505: test-ovsdb parse-data-strings -- '[\"integer\"]' '0' '1' '-1' '+1'"
 at_fn_check_prepare_trace "ovsdb-data.at:505"
 ( $at_check_trace; test-ovsdb parse-data-strings -- '["integer"]' '0' '1' '-1' '+1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164811,13 +165553,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1120
-#AT_START_1121
-at_fn_group_banner 1121 'ovsdb-data.at:512' \
+#AT_STOP_1123
+#AT_START_1124
+at_fn_group_banner 1124 'ovsdb-data.at:512' \
   "real JSON datum - C" "                            " 67
 at_xfail=no
 (
-  $as_echo "1121. $at_setup_line: testing $at_desc ..."
+  $as_echo "1124. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164825,7 +165567,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:512: test-ovsdb parse-data '[\"real\"]' '[0]' '[\"set\",[1.0]]' '[-1.25]'"
 at_fn_check_prepare_trace "ovsdb-data.at:512"
 ( $at_check_trace; test-ovsdb parse-data '["real"]' '[0]' '["set",[1.0]]' '[-1.25]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164842,13 +165584,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1121
-#AT_START_1122
-at_fn_group_banner 1122 'ovsdb-data.at:512' \
+#AT_STOP_1124
+#AT_START_1125
+at_fn_group_banner 1125 'ovsdb-data.at:512' \
   "real JSON datum - Python" "                       " 67
 at_xfail=no
 (
-  $as_echo "1122. $at_setup_line: testing $at_desc ..."
+  $as_echo "1125. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:512" >"$at_check_line_file"
@@ -164860,7 +165602,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:512: \$PYTHON \$srcdir/test-ovsdb.py parse-data '[\"real\"]' '[0]' '[\"set\",[1.0]]' '[-1.25]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-data '[\"real\"]' '[0]' '[\"set\",[1.0]]' '[-1.25]'" "ovsdb-data.at:512"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-data '["real"]' '[0]' '["set",[1.0]]' '[-1.25]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164877,13 +165619,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1122
-#AT_START_1123
-at_fn_group_banner 1123 'ovsdb-data.at:518' \
+#AT_STOP_1125
+#AT_START_1126
+at_fn_group_banner 1126 'ovsdb-data.at:518' \
   "real string datum" "                              " 67
 at_xfail=no
 (
-  $as_echo "1123. $at_setup_line: testing $at_desc ..."
+  $as_echo "1126. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164891,7 +165633,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:518: test-ovsdb parse-data-strings -- '[\"real\"]' '0' '1.0' '-1.25'"
 at_fn_check_prepare_trace "ovsdb-data.at:518"
 ( $at_check_trace; test-ovsdb parse-data-strings -- '["real"]' '0' '1.0' '-1.25'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164908,13 +165650,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1123
-#AT_START_1124
-at_fn_group_banner 1124 'ovsdb-data.at:524' \
+#AT_STOP_1126
+#AT_START_1127
+at_fn_group_banner 1127 'ovsdb-data.at:524' \
   "boolean JSON datum - C" "                         " 67
 at_xfail=no
 (
-  $as_echo "1124. $at_setup_line: testing $at_desc ..."
+  $as_echo "1127. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164922,7 +165664,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:524: test-ovsdb parse-data '[\"boolean\"]' '[\"set\", [true]]' '[false]' "
 at_fn_check_prepare_trace "ovsdb-data.at:524"
 ( $at_check_trace; test-ovsdb parse-data '["boolean"]' '["set", [true]]' '[false]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164938,13 +165680,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1124
-#AT_START_1125
-at_fn_group_banner 1125 'ovsdb-data.at:524' \
+#AT_STOP_1127
+#AT_START_1128
+at_fn_group_banner 1128 'ovsdb-data.at:524' \
   "boolean JSON datum - Python" "                    " 67
 at_xfail=no
 (
-  $as_echo "1125. $at_setup_line: testing $at_desc ..."
+  $as_echo "1128. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:524" >"$at_check_line_file"
@@ -164956,7 +165698,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:524: \$PYTHON \$srcdir/test-ovsdb.py parse-data '[\"boolean\"]' '[\"set\", [true]]' '[false]' "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-data '[\"boolean\"]' '[\"set\", [true]]' '[false]' " "ovsdb-data.at:524"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-data '["boolean"]' '["set", [true]]' '[false]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -164972,13 +165714,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1125
-#AT_START_1126
-at_fn_group_banner 1126 'ovsdb-data.at:529' \
+#AT_STOP_1128
+#AT_START_1129
+at_fn_group_banner 1129 'ovsdb-data.at:529' \
   "boolean string datum" "                           " 67
 at_xfail=no
 (
-  $as_echo "1126. $at_setup_line: testing $at_desc ..."
+  $as_echo "1129. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -164986,7 +165728,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:529: test-ovsdb parse-data-strings '[\"boolean\"]' 'true' 'false' "
 at_fn_check_prepare_trace "ovsdb-data.at:529"
 ( $at_check_trace; test-ovsdb parse-data-strings '["boolean"]' 'true' 'false'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165002,13 +165744,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1126
-#AT_START_1127
-at_fn_group_banner 1127 'ovsdb-data.at:534' \
+#AT_STOP_1129
+#AT_START_1130
+at_fn_group_banner 1130 'ovsdb-data.at:534' \
   "string JSON datum - C" "                          " 67
 at_xfail=no
 (
-  $as_echo "1127. $at_setup_line: testing $at_desc ..."
+  $as_echo "1130. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165016,7 +165758,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:534: test-ovsdb parse-data '[\"string\"]' '[\"set\",[\"\"]]' '[\"true\"]' '[\"\\\"\\\\\\/\\b\\f\\n\\r\\t\"]'"
 at_fn_check_prepare_trace "ovsdb-data.at:534"
 ( $at_check_trace; test-ovsdb parse-data '["string"]' '["set",[""]]' '["true"]' '["\"\\\/\b\f\n\r\t"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165033,13 +165775,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1127
-#AT_START_1128
-at_fn_group_banner 1128 'ovsdb-data.at:534' \
+#AT_STOP_1130
+#AT_START_1131
+at_fn_group_banner 1131 'ovsdb-data.at:534' \
   "string JSON datum - Python" "                     " 67
 at_xfail=no
 (
-  $as_echo "1128. $at_setup_line: testing $at_desc ..."
+  $as_echo "1131. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:534" >"$at_check_line_file"
@@ -165051,7 +165793,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:534: \$PYTHON \$srcdir/test-ovsdb.py parse-data '[\"string\"]' '[\"set\",[\"\"]]' '[\"true\"]' '[\"\\\"\\\\\\/\\b\\f\\n\\r\\t\"]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-data '[\"string\"]' '[\"set\",[\"\"]]' '[\"true\"]' '[\"\\\"\\\\\\/\\b\\f\\n\\r\\t\"]'" "ovsdb-data.at:534"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-data '["string"]' '["set",[""]]' '["true"]' '["\"\\\/\b\f\n\r\t"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165068,13 +165810,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1128
-#AT_START_1129
-at_fn_group_banner 1129 'ovsdb-data.at:540' \
+#AT_STOP_1131
+#AT_START_1132
+at_fn_group_banner 1132 'ovsdb-data.at:540' \
   "string string datum" "                            " 67
 at_xfail=no
 (
-  $as_echo "1129. $at_setup_line: testing $at_desc ..."
+  $as_echo "1132. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165082,7 +165824,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:540: test-ovsdb parse-data-strings '[\"string\"]' '\"x\"' '\"\"' '\"true\"' '\"\\\"\\\\\\/\\b\\f\\n\\r\\t\"'"
 at_fn_check_prepare_trace "ovsdb-data.at:540"
 ( $at_check_trace; test-ovsdb parse-data-strings '["string"]' '"x"' '""' '"true"' '"\"\\\/\b\f\n\r\t"'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165100,13 +165842,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1129
-#AT_START_1130
-at_fn_group_banner 1130 'ovsdb-data.at:549' \
+#AT_STOP_1132
+#AT_START_1133
+at_fn_group_banner 1133 'ovsdb-data.at:549' \
   "JSON optional boolean - C" "                      " 68
 at_xfail=no
 (
-  $as_echo "1130. $at_setup_line: testing $at_desc ..."
+  $as_echo "1133. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165120,7 +165862,7 @@
     '[true]' \
     '["set", [false]]' \
     '["set", []]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165137,13 +165879,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1130
-#AT_START_1131
-at_fn_group_banner 1131 'ovsdb-data.at:549' \
+#AT_STOP_1133
+#AT_START_1134
+at_fn_group_banner 1134 'ovsdb-data.at:549' \
   "JSON optional boolean - Python" "                 " 68
 at_xfail=no
 (
-  $as_echo "1131. $at_setup_line: testing $at_desc ..."
+  $as_echo "1134. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:549" >"$at_check_line_file"
@@ -165161,7 +165903,7 @@
     '[true]' \
     '["set", [false]]' \
     '["set", []]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165178,13 +165920,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1131
-#AT_START_1132
-at_fn_group_banner 1132 'ovsdb-data.at:559' \
+#AT_STOP_1134
+#AT_START_1135
+at_fn_group_banner 1135 'ovsdb-data.at:559' \
   "string optional boolean" "                        " 68
 at_xfail=no
 (
-  $as_echo "1132. $at_setup_line: testing $at_desc ..."
+  $as_echo "1135. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165198,7 +165940,7 @@
     'true' \
     'false' \
     '[]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165215,13 +165957,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1132
-#AT_START_1133
-at_fn_group_banner 1133 'ovsdb-data.at:569' \
+#AT_STOP_1135
+#AT_START_1136
+at_fn_group_banner 1136 'ovsdb-data.at:569' \
   "JSON set of 0 or more integers - C" "             " 68
 at_xfail=no
 (
-  $as_echo "1133. $at_setup_line: testing $at_desc ..."
+  $as_echo "1136. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165243,7 +165985,7 @@
     '["set", [0, 1, 2, 3, 4, 5]]' \
     '["set", [0, 1, 2, 3, 4, 5, 6, 7, 8]]' \
     '["set", [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165264,13 +166006,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1133
-#AT_START_1134
-at_fn_group_banner 1134 'ovsdb-data.at:569' \
+#AT_STOP_1136
+#AT_START_1137
+at_fn_group_banner 1137 'ovsdb-data.at:569' \
   "JSON set of 0 or more integers - Python" "        " 68
 at_xfail=no
 (
-  $as_echo "1134. $at_setup_line: testing $at_desc ..."
+  $as_echo "1137. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:569" >"$at_check_line_file"
@@ -165296,7 +166038,7 @@
     '["set", [0, 1, 2, 3, 4, 5]]' \
     '["set", [0, 1, 2, 3, 4, 5, 6, 7, 8]]' \
     '["set", [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165317,13 +166059,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1134
-#AT_START_1135
-at_fn_group_banner 1135 'ovsdb-data.at:586' \
+#AT_STOP_1137
+#AT_START_1138
+at_fn_group_banner 1138 'ovsdb-data.at:586' \
   "string set of 0 or more integers" "               " 68
 at_xfail=no
 (
-  $as_echo "1135. $at_setup_line: testing $at_desc ..."
+  $as_echo "1138. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165343,7 +166085,7 @@
     '[0, 1,2, 3, 4, 5]' \
     '0, 1,2, 3,4, 5, 6, 7, 8' \
     '[0, 1, 2, 3, 4,5, 6,7, 8, 9, 10]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165363,13 +166105,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1135
-#AT_START_1136
-at_fn_group_banner 1136 'ovsdb-data.at:601' \
+#AT_STOP_1138
+#AT_START_1139
+at_fn_group_banner 1139 'ovsdb-data.at:601' \
   "JSON set of 1 to 3 uuids - C" "                   " 68
 at_xfail=no
 (
-  $as_echo "1136. $at_setup_line: testing $at_desc ..."
+  $as_echo "1139. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165387,7 +166129,7 @@
     '["set", [["uuid", "c5051240-30ff-43ed-b4b9-93cf3f050813"],
               ["uuid", "90558331-09af-4d2f-a572-509cad2e9088"],
               ["uuid", "550e8400-e29b-41d4-a716-446655440000"]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165404,13 +166146,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1136
-#AT_START_1137
-at_fn_group_banner 1137 'ovsdb-data.at:601' \
+#AT_STOP_1139
+#AT_START_1140
+at_fn_group_banner 1140 'ovsdb-data.at:601' \
   "JSON set of 1 to 3 uuids - Python" "              " 68
 at_xfail=no
 (
-  $as_echo "1137. $at_setup_line: testing $at_desc ..."
+  $as_echo "1140. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:601" >"$at_check_line_file"
@@ -165432,7 +166174,7 @@
     '["set", [["uuid", "c5051240-30ff-43ed-b4b9-93cf3f050813"],
               ["uuid", "90558331-09af-4d2f-a572-509cad2e9088"],
               ["uuid", "550e8400-e29b-41d4-a716-446655440000"]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165449,13 +166191,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1137
-#AT_START_1138
-at_fn_group_banner 1138 'ovsdb-data.at:612' \
+#AT_STOP_1140
+#AT_START_1141
+at_fn_group_banner 1141 'ovsdb-data.at:612' \
   "string set of 1 to 3 uuids" "                     " 68
 at_xfail=no
 (
-  $as_echo "1138. $at_setup_line: testing $at_desc ..."
+  $as_echo "1141. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165471,7 +166213,7 @@
     '[c5051240-30ff-43ed-b4b9-93cf3f050813,
       90558331-09af-4d2f-a572-509cad2e9088,
       550e8400-e29b-41d4-a716-446655440000]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165487,13 +166229,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1138
-#AT_START_1139
-at_fn_group_banner 1139 'ovsdb-data.at:621' \
+#AT_STOP_1141
+#AT_START_1142
+at_fn_group_banner 1142 'ovsdb-data.at:621' \
   "JSON set of 0 to 3 strings - C" "                 " 68
 at_xfail=no
 (
-  $as_echo "1139. $at_setup_line: testing $at_desc ..."
+  $as_echo "1142. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165511,7 +166253,7 @@
     '["set", ["a relatively long string"]]' \
     '["set", ["short string", "a relatively long string"]]' \
     '["set", ["zzz", "short string", "a relatively long string"]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165530,13 +166272,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1139
-#AT_START_1140
-at_fn_group_banner 1140 'ovsdb-data.at:621' \
+#AT_STOP_1142
+#AT_START_1143
+at_fn_group_banner 1143 'ovsdb-data.at:621' \
   "JSON set of 0 to 3 strings - Python" "            " 68
 at_xfail=no
 (
-  $as_echo "1140. $at_setup_line: testing $at_desc ..."
+  $as_echo "1143. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:621" >"$at_check_line_file"
@@ -165558,7 +166300,7 @@
     '["set", ["a relatively long string"]]' \
     '["set", ["short string", "a relatively long string"]]' \
     '["set", ["zzz", "short string", "a relatively long string"]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165577,13 +166319,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1140
-#AT_START_1141
-at_fn_group_banner 1141 'ovsdb-data.at:634' \
+#AT_STOP_1143
+#AT_START_1144
+at_fn_group_banner 1144 'ovsdb-data.at:634' \
   "string set of 0 to 3 strings" "                   " 68
 at_xfail=no
 (
-  $as_echo "1141. $at_setup_line: testing $at_desc ..."
+  $as_echo "1144. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165599,7 +166341,7 @@
     '"a relatively long string"' \
     '["short string", "a relatively long string"]' \
     '"zzz","short string","a relatively long string"'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -165617,13 +166359,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1141
-#AT_START_1142
-at_fn_group_banner 1142 'ovsdb-data.at:645' \
+#AT_STOP_1144
+#AT_START_1145
+at_fn_group_banner 1145 'ovsdb-data.at:645' \
   "duplicate boolean not allowed in JSON set - C" "  " 68
 at_xfail=no
 (
-  $as_echo "1142. $at_setup_line: testing $at_desc ..."
+  $as_echo "1145. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165631,7 +166373,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:645: test-ovsdb parse-data '{\"key\": \"boolean\", \"max\": 5}' '[\"set\", [true, true]]'"
 at_fn_check_prepare_trace "ovsdb-data.at:645"
 ( $at_check_trace; test-ovsdb parse-data '{"key": "boolean", "max": 5}' '["set", [true, true]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -165655,7 +166397,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -165668,13 +166410,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1142
-#AT_START_1143
-at_fn_group_banner 1143 'ovsdb-data.at:645' \
+#AT_STOP_1145
+#AT_START_1146
+at_fn_group_banner 1146 'ovsdb-data.at:645' \
   "duplicate boolean not allowed in JSON set - Python" "" 68
 at_xfail=no
 (
-  $as_echo "1143. $at_setup_line: testing $at_desc ..."
+  $as_echo "1146. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:645" >"$at_check_line_file"
@@ -165685,7 +166427,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:645: \$PYTHON \$srcdir/test-ovsdb.py parse-data '{\"key\": \"boolean\", \"max\": 5}' '[\"set\", [true, true]]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-data '{\"key\": \"boolean\", \"max\": 5}' '[\"set\", [true, true]]'" "ovsdb-data.at:645"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-data '{"key": "boolean", "max": 5}' '["set", [true, true]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -165709,7 +166451,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -165722,13 +166464,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1143
-#AT_START_1144
-at_fn_group_banner 1144 'ovsdb-data.at:649' \
+#AT_STOP_1146
+#AT_START_1147
+at_fn_group_banner 1147 'ovsdb-data.at:649' \
   "duplicate boolean not allowed in string set" "    " 68
 at_xfail=no
 (
-  $as_echo "1144. $at_setup_line: testing $at_desc ..."
+  $as_echo "1147. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165736,7 +166478,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:649: test-ovsdb parse-data-strings '{\"key\": \"boolean\", \"max\": 5}' 'true, true'"
 at_fn_check_prepare_trace "ovsdb-data.at:649"
 ( $at_check_trace; test-ovsdb parse-data-strings '{"key": "boolean", "max": 5}' 'true, true'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -165760,7 +166502,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -165773,13 +166515,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1144
-#AT_START_1145
-at_fn_group_banner 1145 'ovsdb-data.at:653' \
+#AT_STOP_1147
+#AT_START_1148
+at_fn_group_banner 1148 'ovsdb-data.at:653' \
   "duplicate integer not allowed in JSON set - C" "  " 68
 at_xfail=no
 (
-  $as_echo "1145. $at_setup_line: testing $at_desc ..."
+  $as_echo "1148. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165787,7 +166529,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:653: test-ovsdb parse-data '{\"key\": \"integer\", \"max\": 5}' '[\"set\", [1, 2, 3, 1]]'"
 at_fn_check_prepare_trace "ovsdb-data.at:653"
 ( $at_check_trace; test-ovsdb parse-data '{"key": "integer", "max": 5}' '["set", [1, 2, 3, 1]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -165811,7 +166553,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -165824,13 +166566,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1145
-#AT_START_1146
-at_fn_group_banner 1146 'ovsdb-data.at:653' \
+#AT_STOP_1148
+#AT_START_1149
+at_fn_group_banner 1149 'ovsdb-data.at:653' \
   "duplicate integer not allowed in JSON set - Python" "" 68
 at_xfail=no
 (
-  $as_echo "1146. $at_setup_line: testing $at_desc ..."
+  $as_echo "1149. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:653" >"$at_check_line_file"
@@ -165841,7 +166583,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:653: \$PYTHON \$srcdir/test-ovsdb.py parse-data '{\"key\": \"integer\", \"max\": 5}' '[\"set\", [1, 2, 3, 1]]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-data '{\"key\": \"integer\", \"max\": 5}' '[\"set\", [1, 2, 3, 1]]'" "ovsdb-data.at:653"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-data '{"key": "integer", "max": 5}' '["set", [1, 2, 3, 1]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -165865,7 +166607,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -165878,13 +166620,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1146
-#AT_START_1147
-at_fn_group_banner 1147 'ovsdb-data.at:657' \
+#AT_STOP_1149
+#AT_START_1150
+at_fn_group_banner 1150 'ovsdb-data.at:657' \
   "duplicate integer not allowed in string set" "    " 68
 at_xfail=no
 (
-  $as_echo "1147. $at_setup_line: testing $at_desc ..."
+  $as_echo "1150. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165892,7 +166634,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:657: test-ovsdb parse-data-strings '{\"key\": \"integer\", \"max\": 5}' '[1, 2, 3, 1]'"
 at_fn_check_prepare_trace "ovsdb-data.at:657"
 ( $at_check_trace; test-ovsdb parse-data-strings '{"key": "integer", "max": 5}' '[1, 2, 3, 1]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -165916,7 +166658,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -165929,13 +166671,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1147
-#AT_START_1148
-at_fn_group_banner 1148 'ovsdb-data.at:661' \
+#AT_STOP_1150
+#AT_START_1151
+at_fn_group_banner 1151 'ovsdb-data.at:661' \
   "duplicate real not allowed in JSON set - C" "     " 68
 at_xfail=no
 (
-  $as_echo "1148. $at_setup_line: testing $at_desc ..."
+  $as_echo "1151. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -165943,7 +166685,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:661: test-ovsdb parse-data '{\"key\": \"real\", \"max\": 5}' '[\"set\", [0.0, -0.0]]'"
 at_fn_check_prepare_trace "ovsdb-data.at:661"
 ( $at_check_trace; test-ovsdb parse-data '{"key": "real", "max": 5}' '["set", [0.0, -0.0]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -165967,7 +166709,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -165980,13 +166722,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1148
-#AT_START_1149
-at_fn_group_banner 1149 'ovsdb-data.at:661' \
+#AT_STOP_1151
+#AT_START_1152
+at_fn_group_banner 1152 'ovsdb-data.at:661' \
   "duplicate real not allowed in JSON set - Python" "" 68
 at_xfail=no
 (
-  $as_echo "1149. $at_setup_line: testing $at_desc ..."
+  $as_echo "1152. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:661" >"$at_check_line_file"
@@ -165997,7 +166739,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:661: \$PYTHON \$srcdir/test-ovsdb.py parse-data '{\"key\": \"real\", \"max\": 5}' '[\"set\", [0.0, -0.0]]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-data '{\"key\": \"real\", \"max\": 5}' '[\"set\", [0.0, -0.0]]'" "ovsdb-data.at:661"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-data '{"key": "real", "max": 5}' '["set", [0.0, -0.0]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -166021,7 +166763,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -166034,13 +166776,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1149
-#AT_START_1150
-at_fn_group_banner 1150 'ovsdb-data.at:665' \
+#AT_STOP_1152
+#AT_START_1153
+at_fn_group_banner 1153 'ovsdb-data.at:665' \
   "duplicate real not allowed in string set" "       " 68
 at_xfail=no
 (
-  $as_echo "1150. $at_setup_line: testing $at_desc ..."
+  $as_echo "1153. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166048,7 +166790,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:665: test-ovsdb parse-data-strings '{\"key\": \"real\", \"max\": 5}' '0.0, -0.0'"
 at_fn_check_prepare_trace "ovsdb-data.at:665"
 ( $at_check_trace; test-ovsdb parse-data-strings '{"key": "real", "max": 5}' '0.0, -0.0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -166072,7 +166814,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -166085,13 +166827,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1150
-#AT_START_1151
-at_fn_group_banner 1151 'ovsdb-data.at:669' \
+#AT_STOP_1153
+#AT_START_1154
+at_fn_group_banner 1154 'ovsdb-data.at:669' \
   "duplicate string not allowed in JSON set - C" "   " 68
 at_xfail=no
 (
-  $as_echo "1151. $at_setup_line: testing $at_desc ..."
+  $as_echo "1154. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166099,7 +166841,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:669: test-ovsdb parse-data '{\"key\": \"string\", \"max\": 5}' '[\"set\", [\"asdf\", \"ASDF\", \"asdf\"]]'"
 at_fn_check_prepare_trace "ovsdb-data.at:669"
 ( $at_check_trace; test-ovsdb parse-data '{"key": "string", "max": 5}' '["set", ["asdf", "ASDF", "asdf"]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -166123,7 +166865,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -166136,13 +166878,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1151
-#AT_START_1152
-at_fn_group_banner 1152 'ovsdb-data.at:669' \
+#AT_STOP_1154
+#AT_START_1155
+at_fn_group_banner 1155 'ovsdb-data.at:669' \
   "duplicate string not allowed in JSON set - Python" "" 68
 at_xfail=no
 (
-  $as_echo "1152. $at_setup_line: testing $at_desc ..."
+  $as_echo "1155. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:669" >"$at_check_line_file"
@@ -166153,7 +166895,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:669: \$PYTHON \$srcdir/test-ovsdb.py parse-data '{\"key\": \"string\", \"max\": 5}' '[\"set\", [\"asdf\", \"ASDF\", \"asdf\"]]'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-data '{\"key\": \"string\", \"max\": 5}' '[\"set\", [\"asdf\", \"ASDF\", \"asdf\"]]'" "ovsdb-data.at:669"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-data '{"key": "string", "max": 5}' '["set", ["asdf", "ASDF", "asdf"]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -166177,7 +166919,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -166190,13 +166932,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1152
-#AT_START_1153
-at_fn_group_banner 1153 'ovsdb-data.at:673' \
+#AT_STOP_1155
+#AT_START_1156
+at_fn_group_banner 1156 'ovsdb-data.at:673' \
   "duplicate string not allowed in string set" "     " 68
 at_xfail=no
 (
-  $as_echo "1153. $at_setup_line: testing $at_desc ..."
+  $as_echo "1156. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166204,7 +166946,7 @@
 $as_echo "$at_srcdir/ovsdb-data.at:673: test-ovsdb parse-data-strings '{\"key\": \"string\", \"max\": 5}' 'asdf, ASDF, \"asdf\"'"
 at_fn_check_prepare_trace "ovsdb-data.at:673"
 ( $at_check_trace; test-ovsdb parse-data-strings '{"key": "string", "max": 5}' 'asdf, ASDF, "asdf"'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -166228,7 +166970,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -166241,13 +166983,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1153
-#AT_START_1154
-at_fn_group_banner 1154 'ovsdb-data.at:677' \
+#AT_STOP_1156
+#AT_START_1157
+at_fn_group_banner 1157 'ovsdb-data.at:677' \
   "duplicate uuid not allowed in JSON set - C" "     " 68
 at_xfail=no
 (
-  $as_echo "1154. $at_setup_line: testing $at_desc ..."
+  $as_echo "1157. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166261,7 +167003,7 @@
     '["set", [["uuid", "7ef21525-0088-4a28-a418-5518413e43ea"],
               ["uuid", "355ad037-f1da-40aa-b47c-ff9c7e8c6a38"],
               ["uuid", "7ef21525-0088-4a28-a418-5518413e43ea"]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -166285,7 +167027,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -166298,13 +167040,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1154
-#AT_START_1155
-at_fn_group_banner 1155 'ovsdb-data.at:677' \
+#AT_STOP_1157
+#AT_START_1158
+at_fn_group_banner 1158 'ovsdb-data.at:677' \
   "duplicate uuid not allowed in JSON set - Python" "" 68
 at_xfail=no
 (
-  $as_echo "1155. $at_setup_line: testing $at_desc ..."
+  $as_echo "1158. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:677" >"$at_check_line_file"
@@ -166321,7 +167063,7 @@
     '["set", [["uuid", "7ef21525-0088-4a28-a418-5518413e43ea"],
               ["uuid", "355ad037-f1da-40aa-b47c-ff9c7e8c6a38"],
               ["uuid", "7ef21525-0088-4a28-a418-5518413e43ea"]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -166345,7 +167087,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -166358,13 +167100,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1155
-#AT_START_1156
-at_fn_group_banner 1156 'ovsdb-data.at:684' \
+#AT_STOP_1158
+#AT_START_1159
+at_fn_group_banner 1159 'ovsdb-data.at:684' \
   "duplicate uuid not allowed in string set" "       " 68
 at_xfail=no
 (
-  $as_echo "1156. $at_setup_line: testing $at_desc ..."
+  $as_echo "1159. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166378,7 +167120,7 @@
     '7ef21525-0088-4a28-a418-5518413e43ea,
      355ad037-f1da-40aa-b47c-ff9c7e8c6a38,
      7ef21525-0088-4a28-a418-5518413e43ea'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -166402,7 +167144,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -166415,13 +167157,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1156
-#AT_START_1157
-at_fn_group_banner 1157 'ovsdb-data.at:693' \
+#AT_STOP_1159
+#AT_START_1160
+at_fn_group_banner 1160 'ovsdb-data.at:693' \
   "JSON map of 1 integer to boolean - C" "           " 69
 at_xfail=no
 (
-  $as_echo "1157. $at_setup_line: testing $at_desc ..."
+  $as_echo "1160. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166431,7 +167173,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-data.at:693"
 ( $at_check_trace; test-ovsdb parse-data '{"key": "integer", "value": "boolean"}' \
     '["map", [[1, true]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166446,13 +167188,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1157
-#AT_START_1158
-at_fn_group_banner 1158 'ovsdb-data.at:693' \
+#AT_STOP_1160
+#AT_START_1161
+at_fn_group_banner 1161 'ovsdb-data.at:693' \
   "JSON map of 1 integer to boolean - Python" "      " 69
 at_xfail=no
 (
-  $as_echo "1158. $at_setup_line: testing $at_desc ..."
+  $as_echo "1161. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:693" >"$at_check_line_file"
@@ -166466,7 +167208,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-data.at:693"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-data '{"key": "integer", "value": "boolean"}' \
     '["map", [[1, true]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166481,13 +167223,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1158
-#AT_START_1159
-at_fn_group_banner 1159 'ovsdb-data.at:698' \
+#AT_STOP_1161
+#AT_START_1162
+at_fn_group_banner 1162 'ovsdb-data.at:698' \
   "string map of 1 integer to boolean" "             " 69
 at_xfail=no
 (
-  $as_echo "1159. $at_setup_line: testing $at_desc ..."
+  $as_echo "1162. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166497,7 +167239,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-data.at:698"
 ( $at_check_trace; test-ovsdb parse-data-strings '{"key": "integer", "value": "boolean"}' \
     '1=true'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166512,13 +167254,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1159
-#AT_START_1160
-at_fn_group_banner 1160 'ovsdb-data.at:703' \
+#AT_STOP_1162
+#AT_START_1163
+at_fn_group_banner 1163 'ovsdb-data.at:703' \
   "JSON map of at least 1 integer to boolean - C" "  " 69
 at_xfail=no
 (
-  $as_echo "1160. $at_setup_line: testing $at_desc ..."
+  $as_echo "1163. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166532,7 +167274,7 @@
     '["map", [[1, true]]]' \
     '["map", [[0, true], [1, false], [2, true], [3, true], [4, true]]]' \
     '["map", [[3, false], [0, true], [4, false]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166549,13 +167291,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1160
-#AT_START_1161
-at_fn_group_banner 1161 'ovsdb-data.at:703' \
+#AT_STOP_1163
+#AT_START_1164
+at_fn_group_banner 1164 'ovsdb-data.at:703' \
   "JSON map of at least 1 integer to boolean - Python" "" 69
 at_xfail=no
 (
-  $as_echo "1161. $at_setup_line: testing $at_desc ..."
+  $as_echo "1164. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:703" >"$at_check_line_file"
@@ -166573,7 +167315,7 @@
     '["map", [[1, true]]]' \
     '["map", [[0, true], [1, false], [2, true], [3, true], [4, true]]]' \
     '["map", [[3, false], [0, true], [4, false]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166590,13 +167332,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1161
-#AT_START_1162
-at_fn_group_banner 1162 'ovsdb-data.at:712' \
+#AT_STOP_1164
+#AT_START_1165
+at_fn_group_banner 1165 'ovsdb-data.at:712' \
   "string map of at least 1 integer to boolean" "    " 69
 at_xfail=no
 (
-  $as_echo "1162. $at_setup_line: testing $at_desc ..."
+  $as_echo "1165. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166610,7 +167352,7 @@
     '1=true' \
     '0=true 1=false 2=true, 3=true 4=true,' \
     '3=false,0=true ,4=false'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166627,13 +167369,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1162
-#AT_START_1163
-at_fn_group_banner 1163 'ovsdb-data.at:721' \
+#AT_STOP_1165
+#AT_START_1166
+at_fn_group_banner 1166 'ovsdb-data.at:721' \
   "JSON map of 1 boolean to integer - C" "           " 69
 at_xfail=no
 (
-  $as_echo "1163. $at_setup_line: testing $at_desc ..."
+  $as_echo "1166. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166643,7 +167385,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-data.at:721"
 ( $at_check_trace; test-ovsdb parse-data '{"key": "boolean", "value": "integer"}' \
    '["map", [[true, 1]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166658,13 +167400,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1163
-#AT_START_1164
-at_fn_group_banner 1164 'ovsdb-data.at:721' \
+#AT_STOP_1166
+#AT_START_1167
+at_fn_group_banner 1167 'ovsdb-data.at:721' \
   "JSON map of 1 boolean to integer - Python" "      " 69
 at_xfail=no
 (
-  $as_echo "1164. $at_setup_line: testing $at_desc ..."
+  $as_echo "1167. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:721" >"$at_check_line_file"
@@ -166678,7 +167420,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-data.at:721"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-data '{"key": "boolean", "value": "integer"}' \
    '["map", [[true, 1]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166693,13 +167435,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1164
-#AT_START_1165
-at_fn_group_banner 1165 'ovsdb-data.at:726' \
+#AT_STOP_1167
+#AT_START_1168
+at_fn_group_banner 1168 'ovsdb-data.at:726' \
   "string map of 1 boolean to integer" "             " 69
 at_xfail=no
 (
-  $as_echo "1165. $at_setup_line: testing $at_desc ..."
+  $as_echo "1168. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166709,7 +167451,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-data.at:726"
 ( $at_check_trace; test-ovsdb parse-data-strings '{"key": "boolean", "value": "integer"}' \
    'true=1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166724,13 +167466,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1165
-#AT_START_1166
-at_fn_group_banner 1166 'ovsdb-data.at:731' \
+#AT_STOP_1168
+#AT_START_1169
+at_fn_group_banner 1169 'ovsdb-data.at:731' \
   "JSON map of 1 uuid to real - C" "                 " 69
 at_xfail=no
 (
-  $as_echo "1166. $at_setup_line: testing $at_desc ..."
+  $as_echo "1169. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166748,7 +167490,7 @@
 	      [["uuid", "d2c4a168-24de-47eb-a8a3-c1abfc814979"], 3.0],
 	      [["uuid", "25bfa475-d072-4f60-8be1-00f48643e9cb"], 4.0],
 	      [["uuid", "1c92b8ca-d5e4-4628-a85d-1dc2d099a99a"], 5.0]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166763,13 +167505,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1166
-#AT_START_1167
-at_fn_group_banner 1167 'ovsdb-data.at:731' \
+#AT_STOP_1169
+#AT_START_1170
+at_fn_group_banner 1170 'ovsdb-data.at:731' \
   "JSON map of 1 uuid to real - Python" "            " 69
 at_xfail=no
 (
-  $as_echo "1167. $at_setup_line: testing $at_desc ..."
+  $as_echo "1170. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:731" >"$at_check_line_file"
@@ -166791,7 +167533,7 @@
 	      [["uuid", "d2c4a168-24de-47eb-a8a3-c1abfc814979"], 3.0],
 	      [["uuid", "25bfa475-d072-4f60-8be1-00f48643e9cb"], 4.0],
 	      [["uuid", "1c92b8ca-d5e4-4628-a85d-1dc2d099a99a"], 5.0]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166806,13 +167548,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1167
-#AT_START_1168
-at_fn_group_banner 1168 'ovsdb-data.at:740' \
+#AT_STOP_1170
+#AT_START_1171
+at_fn_group_banner 1171 'ovsdb-data.at:740' \
   "string map of 1 uuid to real" "                   " 69
 at_xfail=no
 (
-  $as_echo "1168. $at_setup_line: testing $at_desc ..."
+  $as_echo "1171. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166830,7 +167572,7 @@
      d2c4a168-24de-47eb-a8a3-c1abfc814979=3.0,
      25bfa475-d072-4f60-8be1-00f48643e9cb=4.0,
      1c92b8ca-d5e4-4628-a85d-1dc2d099a99a=5.0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166845,13 +167587,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1168
-#AT_START_1169
-at_fn_group_banner 1169 'ovsdb-data.at:749' \
+#AT_STOP_1171
+#AT_START_1172
+at_fn_group_banner 1172 'ovsdb-data.at:749' \
   "JSON map of 10 string to string - C" "            " 69
 at_xfail=no
 (
-  $as_echo "1169. $at_setup_line: testing $at_desc ..."
+  $as_echo "1172. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166879,7 +167621,7 @@
 	      ["2 demibushel", "1 firkin"],
 	      ["2 firkins", "1 kilderkin"],
 	      ["2 kilderkins", "1 barrel"]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166894,13 +167636,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1169
-#AT_START_1170
-at_fn_group_banner 1170 'ovsdb-data.at:749' \
+#AT_STOP_1172
+#AT_START_1173
+at_fn_group_banner 1173 'ovsdb-data.at:749' \
   "JSON map of 10 string to string - Python" "       " 69
 at_xfail=no
 (
-  $as_echo "1170. $at_setup_line: testing $at_desc ..."
+  $as_echo "1173. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:749" >"$at_check_line_file"
@@ -166932,7 +167674,7 @@
 	      ["2 demibushel", "1 firkin"],
 	      ["2 firkins", "1 kilderkin"],
 	      ["2 kilderkins", "1 barrel"]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166947,13 +167689,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1170
-#AT_START_1171
-at_fn_group_banner 1171 'ovsdb-data.at:763' \
+#AT_STOP_1173
+#AT_START_1174
+at_fn_group_banner 1174 'ovsdb-data.at:763' \
   "string map of 10 string to string" "              " 69
 at_xfail=no
 (
-  $as_echo "1171. $at_setup_line: testing $at_desc ..."
+  $as_echo "1174. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -166981,7 +167723,7 @@
       "2 demibushel"= "1 firkin",
       "2 firkins"= "1 kilderkin",
       "2 kilderkins"= "1 barrel"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -166996,13 +167738,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1171
-#AT_START_1172
-at_fn_group_banner 1172 'ovsdb-data.at:777' \
+#AT_STOP_1174
+#AT_START_1175
+at_fn_group_banner 1175 'ovsdb-data.at:777' \
   "duplicate integer key not allowed in JSON map - C" "" 69
 at_xfail=no
 (
-  $as_echo "1172. $at_setup_line: testing $at_desc ..."
+  $as_echo "1175. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167012,7 +167754,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-data.at:777"
 ( $at_check_trace; test-ovsdb parse-data '{"key": "integer", "value": "boolean", "max": 5}' \
     '["map", [[1, true], [2, false], [1, false]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -167036,7 +167778,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -167049,13 +167791,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1172
-#AT_START_1173
-at_fn_group_banner 1173 'ovsdb-data.at:777' \
+#AT_STOP_1175
+#AT_START_1176
+at_fn_group_banner 1176 'ovsdb-data.at:777' \
   "duplicate integer key not allowed in JSON map - Python" "" 69
 at_xfail=no
 (
-  $as_echo "1173. $at_setup_line: testing $at_desc ..."
+  $as_echo "1176. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-data.at:777" >"$at_check_line_file"
@@ -167068,7 +167810,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-data.at:777"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-data '{"key": "integer", "value": "boolean", "max": 5}' \
     '["map", [[1, true], [2, false], [1, false]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -167092,7 +167834,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -167105,13 +167847,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1173
-#AT_START_1174
-at_fn_group_banner 1174 'ovsdb-data.at:782' \
+#AT_STOP_1176
+#AT_START_1177
+at_fn_group_banner 1177 'ovsdb-data.at:782' \
   "duplicate integer key not allowed in string map" "" 69
 at_xfail=no
 (
-  $as_echo "1174. $at_setup_line: testing $at_desc ..."
+  $as_echo "1177. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167121,7 +167863,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-data.at:782"
 ( $at_check_trace; test-ovsdb parse-data-strings '{"key": "integer", "value": "boolean", "max": 5}' \
     '1=true 2=false 1=false'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -167145,7 +167887,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -167158,13 +167900,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1174
-#AT_START_1175
-at_fn_group_banner 1175 'ovsdb-column.at:3' \
+#AT_STOP_1177
+#AT_START_1178
+at_fn_group_banner 1178 'ovsdb-column.at:3' \
   "ordinary column - C" "                            " 70
 at_xfail=no
 (
-  $as_echo "1175. $at_setup_line: testing $at_desc ..."
+  $as_echo "1178. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167172,7 +167914,7 @@
 $as_echo "$at_srcdir/ovsdb-column.at:3: test-ovsdb parse-column mycol '{\"type\": \"integer\"}'"
 at_fn_check_prepare_trace "ovsdb-column.at:3"
 ( $at_check_trace; test-ovsdb parse-column mycol '{"type": "integer"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167187,13 +167929,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1175
-#AT_START_1176
-at_fn_group_banner 1176 'ovsdb-column.at:3' \
+#AT_STOP_1178
+#AT_START_1179
+at_fn_group_banner 1179 'ovsdb-column.at:3' \
   "ordinary column - Python" "                       " 70
 at_xfail=no
 (
-  $as_echo "1176. $at_setup_line: testing $at_desc ..."
+  $as_echo "1179. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-column.at:3" >"$at_check_line_file"
@@ -167205,7 +167947,7 @@
 $as_echo "$at_srcdir/ovsdb-column.at:3: \$PYTHON \$srcdir/test-ovsdb.py parse-column mycol '{\"type\": \"integer\"}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-column mycol '{\"type\": \"integer\"}'" "ovsdb-column.at:3"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-column mycol '{"type": "integer"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167220,13 +167962,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1176
-#AT_START_1177
-at_fn_group_banner 1177 'ovsdb-column.at:7' \
+#AT_STOP_1179
+#AT_START_1180
+at_fn_group_banner 1180 'ovsdb-column.at:7' \
   "immutable column - C" "                           " 70
 at_xfail=no
 (
-  $as_echo "1177. $at_setup_line: testing $at_desc ..."
+  $as_echo "1180. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167234,7 +167976,7 @@
 $as_echo "$at_srcdir/ovsdb-column.at:7: test-ovsdb parse-column mycol '{\"type\": \"real\", \"mutable\": false}'"
 at_fn_check_prepare_trace "ovsdb-column.at:7"
 ( $at_check_trace; test-ovsdb parse-column mycol '{"type": "real", "mutable": false}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167249,13 +167991,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1177
-#AT_START_1178
-at_fn_group_banner 1178 'ovsdb-column.at:7' \
+#AT_STOP_1180
+#AT_START_1181
+at_fn_group_banner 1181 'ovsdb-column.at:7' \
   "immutable column - Python" "                      " 70
 at_xfail=no
 (
-  $as_echo "1178. $at_setup_line: testing $at_desc ..."
+  $as_echo "1181. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-column.at:7" >"$at_check_line_file"
@@ -167267,7 +168009,7 @@
 $as_echo "$at_srcdir/ovsdb-column.at:7: \$PYTHON \$srcdir/test-ovsdb.py parse-column mycol '{\"type\": \"real\", \"mutable\": false}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-column mycol '{\"type\": \"real\", \"mutable\": false}'" "ovsdb-column.at:7"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-column mycol '{"type": "real", "mutable": false}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167282,13 +168024,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1178
-#AT_START_1179
-at_fn_group_banner 1179 'ovsdb-column.at:11' \
+#AT_STOP_1181
+#AT_START_1182
+at_fn_group_banner 1182 'ovsdb-column.at:11' \
   "ephemeral column - C" "                           " 70
 at_xfail=no
 (
-  $as_echo "1179. $at_setup_line: testing $at_desc ..."
+  $as_echo "1182. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167296,7 +168038,7 @@
 $as_echo "$at_srcdir/ovsdb-column.at:11: test-ovsdb parse-column mycol '{\"type\": \"uuid\", \"ephemeral\": true}'"
 at_fn_check_prepare_trace "ovsdb-column.at:11"
 ( $at_check_trace; test-ovsdb parse-column mycol '{"type": "uuid", "ephemeral": true}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167311,13 +168053,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1179
-#AT_START_1180
-at_fn_group_banner 1180 'ovsdb-column.at:11' \
+#AT_STOP_1182
+#AT_START_1183
+at_fn_group_banner 1183 'ovsdb-column.at:11' \
   "ephemeral column - Python" "                      " 70
 at_xfail=no
 (
-  $as_echo "1180. $at_setup_line: testing $at_desc ..."
+  $as_echo "1183. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-column.at:11" >"$at_check_line_file"
@@ -167329,7 +168071,7 @@
 $as_echo "$at_srcdir/ovsdb-column.at:11: \$PYTHON \$srcdir/test-ovsdb.py parse-column mycol '{\"type\": \"uuid\", \"ephemeral\": true}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-column mycol '{\"type\": \"uuid\", \"ephemeral\": true}'" "ovsdb-column.at:11"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-column mycol '{"type": "uuid", "ephemeral": true}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167344,13 +168086,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1180
-#AT_START_1181
-at_fn_group_banner 1181 'ovsdb-table.at:3' \
+#AT_STOP_1183
+#AT_START_1184
+at_fn_group_banner 1184 'ovsdb-table.at:3' \
   "non-root table with one column - C" "             " 71
 at_xfail=no
 (
-  $as_echo "1181. $at_setup_line: testing $at_desc ..."
+  $as_echo "1184. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167358,7 +168100,7 @@
 $as_echo "$at_srcdir/ovsdb-table.at:3: test-ovsdb parse-table mytable '{\"columns\": {\"name\": {\"type\": \"string\"}}}'"
 at_fn_check_prepare_trace "ovsdb-table.at:3"
 ( $at_check_trace; test-ovsdb parse-table mytable '{"columns": {"name": {"type": "string"}}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167373,13 +168115,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1181
-#AT_START_1182
-at_fn_group_banner 1182 'ovsdb-table.at:3' \
+#AT_STOP_1184
+#AT_START_1185
+at_fn_group_banner 1185 'ovsdb-table.at:3' \
   "non-root table with one column - Python" "        " 71
 at_xfail=no
 (
-  $as_echo "1182. $at_setup_line: testing $at_desc ..."
+  $as_echo "1185. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:3" >"$at_check_line_file"
@@ -167391,7 +168133,7 @@
 $as_echo "$at_srcdir/ovsdb-table.at:3: \$PYTHON \$srcdir/test-ovsdb.py parse-table mytable '{\"columns\": {\"name\": {\"type\": \"string\"}}}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-table mytable '{\"columns\": {\"name\": {\"type\": \"string\"}}}'" "ovsdb-table.at:3"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable '{"columns": {"name": {"type": "string"}}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167406,13 +168148,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1182
-#AT_START_1183
-at_fn_group_banner 1183 'ovsdb-table.at:7' \
+#AT_STOP_1185
+#AT_START_1186
+at_fn_group_banner 1186 'ovsdb-table.at:7' \
   "immutable table with one column - C" "            " 71
 at_xfail=no
 (
-  $as_echo "1183. $at_setup_line: testing $at_desc ..."
+  $as_echo "1186. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167424,7 +168166,7 @@
 ( $at_check_trace; test-ovsdb parse-table mytable \
     '{"columns": {"name": {"type": "string"}},
       "mutable": false}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167439,13 +168181,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1183
-#AT_START_1184
-at_fn_group_banner 1184 'ovsdb-table.at:7' \
+#AT_STOP_1186
+#AT_START_1187
+at_fn_group_banner 1187 'ovsdb-table.at:7' \
   "immutable table with one column - Python" "       " 71
 at_xfail=no
 (
-  $as_echo "1184. $at_setup_line: testing $at_desc ..."
+  $as_echo "1187. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:7" >"$at_check_line_file"
@@ -167461,7 +168203,7 @@
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable \
     '{"columns": {"name": {"type": "string"}},
       "mutable": false}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167476,13 +168218,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1184
-#AT_START_1185
-at_fn_group_banner 1185 'ovsdb-table.at:13' \
+#AT_STOP_1187
+#AT_START_1188
+at_fn_group_banner 1188 'ovsdb-table.at:13' \
   "root table with one column - C" "                 " 71
 at_xfail=no
 (
-  $as_echo "1185. $at_setup_line: testing $at_desc ..."
+  $as_echo "1188. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167494,7 +168236,7 @@
 ( $at_check_trace; test-ovsdb parse-table mytable \
     '{"columns": {"name": {"type": "string"}},
       "isRoot": true}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167509,13 +168251,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1185
-#AT_START_1186
-at_fn_group_banner 1186 'ovsdb-table.at:13' \
+#AT_STOP_1188
+#AT_START_1189
+at_fn_group_banner 1189 'ovsdb-table.at:13' \
   "root table with one column - Python" "            " 71
 at_xfail=no
 (
-  $as_echo "1186. $at_setup_line: testing $at_desc ..."
+  $as_echo "1189. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:13" >"$at_check_line_file"
@@ -167531,7 +168273,7 @@
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable \
     '{"columns": {"name": {"type": "string"}},
       "isRoot": true}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167546,13 +168288,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1186
-#AT_START_1187
-at_fn_group_banner 1187 'ovsdb-table.at:19' \
+#AT_STOP_1189
+#AT_START_1190
+at_fn_group_banner 1190 'ovsdb-table.at:19' \
   "non-root table with default_is_root=true - C" "   " 71
 at_xfail=no
 (
-  $as_echo "1187. $at_setup_line: testing $at_desc ..."
+  $as_echo "1190. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167560,7 +168302,7 @@
 $as_echo "$at_srcdir/ovsdb-table.at:19: test-ovsdb parse-table mytable '{\"columns\": {\"name\": {\"type\": \"string\"}}}' true"
 at_fn_check_prepare_trace "ovsdb-table.at:19"
 ( $at_check_trace; test-ovsdb parse-table mytable '{"columns": {"name": {"type": "string"}}}' true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167575,13 +168317,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1187
-#AT_START_1188
-at_fn_group_banner 1188 'ovsdb-table.at:19' \
+#AT_STOP_1190
+#AT_START_1191
+at_fn_group_banner 1191 'ovsdb-table.at:19' \
   "non-root table with default_is_root=true - Python" "" 71
 at_xfail=no
 (
-  $as_echo "1188. $at_setup_line: testing $at_desc ..."
+  $as_echo "1191. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:19" >"$at_check_line_file"
@@ -167593,7 +168335,7 @@
 $as_echo "$at_srcdir/ovsdb-table.at:19: \$PYTHON \$srcdir/test-ovsdb.py parse-table mytable '{\"columns\": {\"name\": {\"type\": \"string\"}}}' true"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-table mytable '{\"columns\": {\"name\": {\"type\": \"string\"}}}' true" "ovsdb-table.at:19"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable '{"columns": {"name": {"type": "string"}}}' true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167608,13 +168350,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1188
-#AT_START_1189
-at_fn_group_banner 1189 'ovsdb-table.at:23' \
+#AT_STOP_1191
+#AT_START_1192
+at_fn_group_banner 1192 'ovsdb-table.at:23' \
   "root table with default_is_root=true - C" "       " 71
 at_xfail=no
 (
-  $as_echo "1189. $at_setup_line: testing $at_desc ..."
+  $as_echo "1192. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167626,7 +168368,7 @@
 ( $at_check_trace; test-ovsdb parse-table mytable \
     '{"columns": {"name": {"type": "string"}},
       "isRoot": true}' true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167641,13 +168383,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1189
-#AT_START_1190
-at_fn_group_banner 1190 'ovsdb-table.at:23' \
+#AT_STOP_1192
+#AT_START_1193
+at_fn_group_banner 1193 'ovsdb-table.at:23' \
   "root table with default_is_root=true - Python" "  " 71
 at_xfail=no
 (
-  $as_echo "1190. $at_setup_line: testing $at_desc ..."
+  $as_echo "1193. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:23" >"$at_check_line_file"
@@ -167663,7 +168405,7 @@
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable \
     '{"columns": {"name": {"type": "string"}},
       "isRoot": true}' true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167678,13 +168420,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1190
-#AT_START_1191
-at_fn_group_banner 1191 'ovsdb-table.at:29' \
+#AT_STOP_1193
+#AT_START_1194
+at_fn_group_banner 1194 'ovsdb-table.at:29' \
   "table with maxRows of 2 - C" "                    " 71
 at_xfail=no
 (
-  $as_echo "1191. $at_setup_line: testing $at_desc ..."
+  $as_echo "1194. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167694,7 +168436,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-table.at:29"
 ( $at_check_trace; test-ovsdb parse-table mytable '{"columns": {"name": {"type": "string"}},
                           "maxRows": 2}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167709,13 +168451,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1191
-#AT_START_1192
-at_fn_group_banner 1192 'ovsdb-table.at:29' \
+#AT_STOP_1194
+#AT_START_1195
+at_fn_group_banner 1195 'ovsdb-table.at:29' \
   "table with maxRows of 2 - Python" "               " 71
 at_xfail=no
 (
-  $as_echo "1192. $at_setup_line: testing $at_desc ..."
+  $as_echo "1195. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:29" >"$at_check_line_file"
@@ -167729,7 +168471,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-table.at:29"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable '{"columns": {"name": {"type": "string"}},
                           "maxRows": 2}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167744,13 +168486,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1192
-#AT_START_1193
-at_fn_group_banner 1193 'ovsdb-table.at:34' \
+#AT_STOP_1195
+#AT_START_1196
+at_fn_group_banner 1196 'ovsdb-table.at:34' \
   "table with index - C" "                           " 71
 at_xfail=no
 (
-  $as_echo "1193. $at_setup_line: testing $at_desc ..."
+  $as_echo "1196. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167762,7 +168504,7 @@
 ( $at_check_trace; test-ovsdb parse-table mytable '{"columns": {"a": {"type": "integer"},
                                       "b": {"type": "string"}},
                           "indexes": [["b", "a"]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167777,13 +168519,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1193
-#AT_START_1194
-at_fn_group_banner 1194 'ovsdb-table.at:34' \
+#AT_STOP_1196
+#AT_START_1197
+at_fn_group_banner 1197 'ovsdb-table.at:34' \
   "table with index - Python" "                      " 71
 at_xfail=no
 (
-  $as_echo "1194. $at_setup_line: testing $at_desc ..."
+  $as_echo "1197. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:34" >"$at_check_line_file"
@@ -167799,7 +168541,7 @@
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable '{"columns": {"a": {"type": "integer"},
                                       "b": {"type": "string"}},
                           "indexes": [["b", "a"]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -167814,13 +168556,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1194
-#AT_START_1195
-at_fn_group_banner 1195 'ovsdb-table.at:40' \
+#AT_STOP_1197
+#AT_START_1198
+at_fn_group_banner 1198 'ovsdb-table.at:40' \
   "table with syntax error in index - C" "           " 71
 at_xfail=no
 (
-  $as_echo "1195. $at_setup_line: testing $at_desc ..."
+  $as_echo "1198. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167832,7 +168574,7 @@
 ( $at_check_trace; test-ovsdb parse-table mytable '{"columns": {"a": {"type": "integer"},
                                       "b": {"type": "string"}},
                           "indexes": [["b", "a"], [0]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -167856,7 +168598,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -167869,13 +168611,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1195
-#AT_START_1196
-at_fn_group_banner 1196 'ovsdb-table.at:40' \
+#AT_STOP_1198
+#AT_START_1199
+at_fn_group_banner 1199 'ovsdb-table.at:40' \
   "table with syntax error in index - Python" "      " 71
 at_xfail=no
 (
-  $as_echo "1196. $at_setup_line: testing $at_desc ..."
+  $as_echo "1199. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:40" >"$at_check_line_file"
@@ -167890,7 +168632,7 @@
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable '{"columns": {"a": {"type": "integer"},
                                       "b": {"type": "string"}},
                           "indexes": [["b", "a"], [0]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -167914,7 +168656,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -167927,13 +168669,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1196
-#AT_START_1197
-at_fn_group_banner 1197 'ovsdb-table.at:46' \
+#AT_STOP_1199
+#AT_START_1200
+at_fn_group_banner 1200 'ovsdb-table.at:46' \
   "table with empty index - C" "                     " 71
 at_xfail=no
 (
-  $as_echo "1197. $at_setup_line: testing $at_desc ..."
+  $as_echo "1200. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -167945,7 +168687,7 @@
 ( $at_check_trace; test-ovsdb parse-table mytable '{"columns": {"a": {"type": "integer"},
                                       "b": {"type": "string"}},
                           "indexes": [[]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -167969,7 +168711,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -167982,13 +168724,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1197
-#AT_START_1198
-at_fn_group_banner 1198 'ovsdb-table.at:46' \
+#AT_STOP_1200
+#AT_START_1201
+at_fn_group_banner 1201 'ovsdb-table.at:46' \
   "table with empty index - Python" "                " 71
 at_xfail=no
 (
-  $as_echo "1198. $at_setup_line: testing $at_desc ..."
+  $as_echo "1201. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:46" >"$at_check_line_file"
@@ -168003,7 +168745,7 @@
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable '{"columns": {"a": {"type": "integer"},
                                       "b": {"type": "string"}},
                           "indexes": [[]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -168027,7 +168769,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -168040,13 +168782,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1198
-#AT_START_1199
-at_fn_group_banner 1199 'ovsdb-table.at:52' \
+#AT_STOP_1201
+#AT_START_1202
+at_fn_group_banner 1202 'ovsdb-table.at:52' \
   "table with index of ephemeral column - C" "       " 71
 at_xfail=no
 (
-  $as_echo "1199. $at_setup_line: testing $at_desc ..."
+  $as_echo "1202. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168060,7 +168802,7 @@
                                             "ephemeral": true},
                                       "b": {"type": "string"}},
                           "indexes": [["b", "a"]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -168084,7 +168826,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -168097,13 +168839,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1199
-#AT_START_1200
-at_fn_group_banner 1200 'ovsdb-table.at:52' \
+#AT_STOP_1202
+#AT_START_1203
+at_fn_group_banner 1203 'ovsdb-table.at:52' \
   "table with index of ephemeral column - Python" "  " 71
 at_xfail=no
 (
-  $as_echo "1200. $at_setup_line: testing $at_desc ..."
+  $as_echo "1203. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:52" >"$at_check_line_file"
@@ -168120,7 +168862,7 @@
                                             "ephemeral": true},
                                       "b": {"type": "string"}},
                           "indexes": [["b", "a"]]}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -168144,7 +168886,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -168157,13 +168899,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1200
-#AT_START_1201
-at_fn_group_banner 1201 'ovsdb-table.at:59' \
+#AT_STOP_1203
+#AT_START_1204
+at_fn_group_banner 1204 'ovsdb-table.at:59' \
   "column names may not begin with _ - C" "          " 71
 at_xfail=no
 (
-  $as_echo "1201. $at_setup_line: testing $at_desc ..."
+  $as_echo "1204. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168173,7 +168915,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-table.at:59"
 ( $at_check_trace; test-ovsdb parse-table mytable \
     '{"columns": {"_column": {"type": "integer"}}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -168197,7 +168939,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -168210,13 +168952,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1201
-#AT_START_1202
-at_fn_group_banner 1202 'ovsdb-table.at:59' \
+#AT_STOP_1204
+#AT_START_1205
+at_fn_group_banner 1205 'ovsdb-table.at:59' \
   "column names may not begin with _ - Python" "     " 71
 at_xfail=no
 (
-  $as_echo "1202. $at_setup_line: testing $at_desc ..."
+  $as_echo "1205. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:59" >"$at_check_line_file"
@@ -168229,7 +168971,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-table.at:59"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable \
     '{"columns": {"_column": {"type": "integer"}}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -168253,7 +168995,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -168266,13 +169008,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1202
-#AT_START_1203
-at_fn_group_banner 1203 'ovsdb-table.at:65' \
+#AT_STOP_1205
+#AT_START_1206
+at_fn_group_banner 1206 'ovsdb-table.at:65' \
   "table must have at least one column (1) - C" "    " 71
 at_xfail=no
 (
-  $as_echo "1203. $at_setup_line: testing $at_desc ..."
+  $as_echo "1206. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168280,7 +169022,7 @@
 $as_echo "$at_srcdir/ovsdb-table.at:65: test-ovsdb parse-table mytable '{}'"
 at_fn_check_prepare_trace "ovsdb-table.at:65"
 ( $at_check_trace; test-ovsdb parse-table mytable '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -168304,7 +169046,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -168317,13 +169059,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1203
-#AT_START_1204
-at_fn_group_banner 1204 'ovsdb-table.at:65' \
+#AT_STOP_1206
+#AT_START_1207
+at_fn_group_banner 1207 'ovsdb-table.at:65' \
   "table must have at least one column (1) - Python" "" 71
 at_xfail=no
 (
-  $as_echo "1204. $at_setup_line: testing $at_desc ..."
+  $as_echo "1207. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:65" >"$at_check_line_file"
@@ -168334,7 +169076,7 @@
 $as_echo "$at_srcdir/ovsdb-table.at:65: \$PYTHON \$srcdir/test-ovsdb.py parse-table mytable '{}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-table mytable '{}'" "ovsdb-table.at:65"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -168358,7 +169100,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -168371,13 +169113,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1204
-#AT_START_1205
-at_fn_group_banner 1205 'ovsdb-table.at:69' \
+#AT_STOP_1207
+#AT_START_1208
+at_fn_group_banner 1208 'ovsdb-table.at:69' \
   "table must have at least one column (2) - C" "    " 71
 at_xfail=no
 (
-  $as_echo "1205. $at_setup_line: testing $at_desc ..."
+  $as_echo "1208. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168385,7 +169127,7 @@
 $as_echo "$at_srcdir/ovsdb-table.at:69: test-ovsdb parse-table mytable '{\"columns\": {}}'"
 at_fn_check_prepare_trace "ovsdb-table.at:69"
 ( $at_check_trace; test-ovsdb parse-table mytable '{"columns": {}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -168409,7 +169151,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -168422,13 +169164,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1205
-#AT_START_1206
-at_fn_group_banner 1206 'ovsdb-table.at:69' \
+#AT_STOP_1208
+#AT_START_1209
+at_fn_group_banner 1209 'ovsdb-table.at:69' \
   "table must have at least one column (2) - Python" "" 71
 at_xfail=no
 (
-  $as_echo "1206. $at_setup_line: testing $at_desc ..."
+  $as_echo "1209. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:69" >"$at_check_line_file"
@@ -168439,7 +169181,7 @@
 $as_echo "$at_srcdir/ovsdb-table.at:69: \$PYTHON \$srcdir/test-ovsdb.py parse-table mytable '{\"columns\": {}}'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py parse-table mytable '{\"columns\": {}}'" "ovsdb-table.at:69"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable '{"columns": {}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -168463,7 +169205,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -168476,13 +169218,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1206
-#AT_START_1207
-at_fn_group_banner 1207 'ovsdb-table.at:73' \
+#AT_STOP_1209
+#AT_START_1210
+at_fn_group_banner 1210 'ovsdb-table.at:73' \
   "table maxRows must be positive - C" "             " 71
 at_xfail=no
 (
-  $as_echo "1207. $at_setup_line: testing $at_desc ..."
+  $as_echo "1210. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168492,7 +169234,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-table.at:73"
 ( $at_check_trace; test-ovsdb parse-table mytable '{"columns": {"name": {"type": "string"}},
                           "maxRows": 0}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -168516,7 +169258,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -168529,13 +169271,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1207
-#AT_START_1208
-at_fn_group_banner 1208 'ovsdb-table.at:73' \
+#AT_STOP_1210
+#AT_START_1211
+at_fn_group_banner 1211 'ovsdb-table.at:73' \
   "table maxRows must be positive - Python" "        " 71
 at_xfail=no
 (
-  $as_echo "1208. $at_setup_line: testing $at_desc ..."
+  $as_echo "1211. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-table.at:73" >"$at_check_line_file"
@@ -168548,7 +169290,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-table.at:73"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py parse-table mytable '{"columns": {"name": {"type": "string"}},
                           "maxRows": 0}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -168572,7 +169314,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -168585,13 +169327,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1208
-#AT_START_1209
-at_fn_group_banner 1209 'ovsdb-row.at:3' \
+#AT_STOP_1211
+#AT_START_1212
+at_fn_group_banner 1212 'ovsdb-row.at:3' \
   "row with one string column" "                     " 72
 at_xfail=no
 (
-  $as_echo "1209. $at_setup_line: testing $at_desc ..."
+  $as_echo "1212. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168609,7 +169351,7 @@
     '{"name": ""}' \
     '{"name": "longer string with spaces"}' \
     '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -168631,13 +169373,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1209
-#AT_START_1210
-at_fn_group_banner 1210 'ovsdb-row.at:19' \
+#AT_STOP_1212
+#AT_START_1213
+at_fn_group_banner 1213 'ovsdb-row.at:19' \
   "row with one integer column" "                    " 72
 at_xfail=no
 (
-  $as_echo "1210. $at_setup_line: testing $at_desc ..."
+  $as_echo "1213. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168655,7 +169397,7 @@
     '{"count": -1}' \
     '{"count": 2e10}' \
     '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -168677,13 +169419,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1210
-#AT_START_1211
-at_fn_group_banner 1211 'ovsdb-row.at:35' \
+#AT_STOP_1213
+#AT_START_1214
+at_fn_group_banner 1214 'ovsdb-row.at:35' \
   "row with one real column" "                       " 72
 at_xfail=no
 (
-  $as_echo "1211. $at_setup_line: testing $at_desc ..."
+  $as_echo "1214. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168701,7 +169443,7 @@
     '{"cost": -2.0}' \
     '{"cost": 123000}' \
     '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -168723,13 +169465,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1211
-#AT_START_1212
-at_fn_group_banner 1212 'ovsdb-row.at:51' \
+#AT_STOP_1214
+#AT_START_1215
+at_fn_group_banner 1215 'ovsdb-row.at:51' \
   "row with one boolean column" "                    " 72
 at_xfail=no
 (
-  $as_echo "1212. $at_setup_line: testing $at_desc ..."
+  $as_echo "1215. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168745,7 +169487,7 @@
     '{"feasible": true}' \
     '{"feasible": false}' \
     '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -168765,13 +169507,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1212
-#AT_START_1213
-at_fn_group_banner 1213 'ovsdb-row.at:64' \
+#AT_STOP_1215
+#AT_START_1216
+at_fn_group_banner 1216 'ovsdb-row.at:64' \
   "row with one uuid column" "                       " 72
 at_xfail=no
 (
-  $as_echo "1213. $at_setup_line: testing $at_desc ..."
+  $as_echo "1216. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168787,7 +169529,7 @@
     '{"ref": ["uuid", "f707423d-bf5b-48b5-b6c0-797c900ba4b6"]}' \
     '{"ref": ["uuid", "33583cc5-d2f4-43de-b1ca-8aac14071b51"]}' \
     '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -168807,13 +169549,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1213
-#AT_START_1214
-at_fn_group_banner 1214 'ovsdb-row.at:77' \
+#AT_STOP_1216
+#AT_START_1217
+at_fn_group_banner 1217 'ovsdb-row.at:77' \
   "row with set of 1 to 2 elements" "                " 72
 at_xfail=no
 (
-  $as_echo "1214. $at_setup_line: testing $at_desc ..."
+  $as_echo "1217. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168825,7 +169567,7 @@
 ( $at_check_trace; test-ovsdb parse-rows \
     '{"columns": {"myset": {"type": {"key": "integer", "min": 1, "max": 2}}}}' \
     '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -168841,13 +169583,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1214
-#AT_START_1215
-at_fn_group_banner 1215 'ovsdb-row.at:84' \
+#AT_STOP_1217
+#AT_START_1218
+at_fn_group_banner 1218 'ovsdb-row.at:84' \
   "row with map of 1 to 2 elements" "                " 72
 at_xfail=no
 (
-  $as_echo "1215. $at_setup_line: testing $at_desc ..."
+  $as_echo "1218. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168859,7 +169601,7 @@
 ( $at_check_trace; test-ovsdb parse-rows \
     '{"columns": {"mymap": {"type": {"key": "integer", "value": "uuid", "min": 1, "max": 2}}}}' \
     '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -168875,13 +169617,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1215
-#AT_START_1216
-at_fn_group_banner 1216 'ovsdb-row.at:91' \
+#AT_STOP_1218
+#AT_START_1219
+at_fn_group_banner 1219 'ovsdb-row.at:91' \
   "row with several columns" "                       " 72
 at_xfail=no
 (
-  $as_echo "1216. $at_setup_line: testing $at_desc ..."
+  $as_echo "1219. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -168919,7 +169661,7 @@
       "datapath_id": "000ae4256bb0",
       "hwaddr": "00:0a:e4:25:6b:b0"}' \
     '{}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -168937,13 +169679,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1216
-#AT_START_1217
-at_fn_group_banner 1217 'ovsdb-row.at:113' \
+#AT_STOP_1219
+#AT_START_1220
+at_fn_group_banner 1220 'ovsdb-row.at:113' \
   "row hashing (scalars)" "                          " 72
 at_xfail=no
 (
-  $as_echo "1217. $at_setup_line: testing $at_desc ..."
+  $as_echo "1220. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -169053,7 +169795,7 @@
      '["u7", {"u": ["uuid","00000010-0000-0000-0000-000000000000"]}]' \
      '["u8", {"u": ["uuid","00000001-0000-0000-0000-000000000000"]}]' \
      '["null6", {"u": ["uuid","00000000-c6db-4d22-970f-b41fabd20c4b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -169082,13 +169824,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1217
-#AT_START_1218
-at_fn_group_banner 1218 'ovsdb-row.at:182' \
+#AT_STOP_1220
+#AT_START_1221
+at_fn_group_banner 1221 'ovsdb-row.at:182' \
   "row hashing (sets)" "                             " 72
 at_xfail=no
 (
-  $as_echo "1218. $at_setup_line: testing $at_desc ..."
+  $as_echo "1221. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -169154,7 +169896,7 @@
     '["sb", {"s": ["set", ["b"]]}]' \
     '["sab", {"s": ["set", ["a", "b"]]}]' \
     '["sba", {"s": ["set", ["b", "a"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -169189,13 +169931,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1218
-#AT_START_1219
-at_fn_group_banner 1219 'ovsdb-row.at:235' \
+#AT_STOP_1221
+#AT_START_1222
+at_fn_group_banner 1222 'ovsdb-row.at:235' \
   "row hashing (maps)" "                             " 72
 at_xfail=no
 (
-  $as_echo "1219. $at_setup_line: testing $at_desc ..."
+  $as_echo "1222. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -169273,7 +170015,7 @@
     '["ss10", {"ss": ["map", [["a", "b"], ["b", "a"]]]}]' \
     '["ss11", {"ss": ["map", [["a", "b"], ["b", "b"]]]}]'; echo
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -169288,13 +170030,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1219
-#AT_START_1220
-at_fn_group_banner 1220 'ovsdb-schema.at:3' \
+#AT_STOP_1222
+#AT_START_1223
+at_fn_group_banner 1223 'ovsdb-schema.at:3' \
   "schema with valid refTables - C" "                " 73
 at_xfail=no
 (
-  $as_echo "1220. $at_setup_line: testing $at_desc ..."
+  $as_echo "1223. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -169342,7 +170084,7 @@
                   "key": {
                     "type": "uuid",
                     "refTable": "a"}}}}}}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -169357,13 +170099,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1220
-#AT_START_1221
-at_fn_group_banner 1221 'ovsdb-schema.at:3' \
+#AT_STOP_1223
+#AT_START_1224
+at_fn_group_banner 1224 'ovsdb-schema.at:3' \
   "schema with valid refTables - Python" "           " 73
 at_xfail=no
 (
-  $as_echo "1221. $at_setup_line: testing $at_desc ..."
+  $as_echo "1224. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-schema.at:3" >"$at_check_line_file"
@@ -169415,7 +170157,7 @@
                   "key": {
                     "type": "uuid",
                     "refTable": "a"}}}}}}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -169430,13 +170172,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1221
-#AT_START_1222
-at_fn_group_banner 1222 'ovsdb-schema.at:30' \
+#AT_STOP_1224
+#AT_START_1225
+at_fn_group_banner 1225 'ovsdb-schema.at:30' \
   "schema with ephemeral strong references - C" "    " 73
 at_xfail=no
 (
-  $as_echo "1222. $at_setup_line: testing $at_desc ..."
+  $as_echo "1225. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -169494,7 +170236,7 @@
                     "type": "uuid",
                     "refTable": "a"}}}},
               "isRoot": true}}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -169509,13 +170251,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1222
-#AT_START_1223
-at_fn_group_banner 1223 'ovsdb-schema.at:30' \
+#AT_STOP_1225
+#AT_START_1226
+at_fn_group_banner 1226 'ovsdb-schema.at:30' \
   "schema with ephemeral strong references - Python" "" 73
 at_xfail=no
 (
-  $as_echo "1223. $at_setup_line: testing $at_desc ..."
+  $as_echo "1226. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-schema.at:30" >"$at_check_line_file"
@@ -169577,7 +170319,7 @@
                     "type": "uuid",
                     "refTable": "a"}}}},
               "isRoot": true}}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -169592,13 +170334,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1223
-#AT_START_1224
-at_fn_group_banner 1224 'ovsdb-schema.at:61' \
+#AT_STOP_1226
+#AT_START_1227
+at_fn_group_banner 1227 'ovsdb-schema.at:61' \
   "schema without version number - C" "              " 73
 at_xfail=no
 (
-  $as_echo "1224. $at_setup_line: testing $at_desc ..."
+  $as_echo "1227. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -169618,7 +170360,7 @@
             "columns": {
               "y": {
                 "type": "integer"}}}}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -169633,13 +170375,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1224
-#AT_START_1225
-at_fn_group_banner 1225 'ovsdb-schema.at:61' \
+#AT_STOP_1227
+#AT_START_1228
+at_fn_group_banner 1228 'ovsdb-schema.at:61' \
   "schema without version number - Python" "         " 73
 at_xfail=no
 (
-  $as_echo "1225. $at_setup_line: testing $at_desc ..."
+  $as_echo "1228. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-schema.at:61" >"$at_check_line_file"
@@ -169663,7 +170405,7 @@
             "columns": {
               "y": {
                 "type": "integer"}}}}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -169678,13 +170420,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1225
-#AT_START_1226
-at_fn_group_banner 1226 'ovsdb-schema.at:71' \
+#AT_STOP_1228
+#AT_START_1229
+at_fn_group_banner 1229 'ovsdb-schema.at:71' \
   "schema with invalid refTables - C" "              " 73
 at_xfail=no
 (
-  $as_echo "1226. $at_setup_line: testing $at_desc ..."
+  $as_echo "1229. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -169730,7 +170472,7 @@
                   "key": {
                     "type": "uuid",
                     "refTable": "a"}}}}}}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -169754,7 +170496,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -169767,13 +170509,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1226
-#AT_START_1227
-at_fn_group_banner 1227 'ovsdb-schema.at:71' \
+#AT_STOP_1229
+#AT_START_1230
+at_fn_group_banner 1230 'ovsdb-schema.at:71' \
   "schema with invalid refTables - Python" "         " 73
 at_xfail=no
 (
-  $as_echo "1227. $at_setup_line: testing $at_desc ..."
+  $as_echo "1230. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-schema.at:71" >"$at_check_line_file"
@@ -169822,7 +170564,7 @@
                   "key": {
                     "type": "uuid",
                     "refTable": "a"}}}}}}}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -169846,7 +170588,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -169859,13 +170601,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1227
-#AT_START_1228
-at_fn_group_banner 1228 'ovsdb-schema.at:94' \
+#AT_STOP_1230
+#AT_START_1231
+at_fn_group_banner 1231 'ovsdb-schema.at:94' \
   "schema with invalid version number - C" "         " 73
 at_xfail=no
 (
-  $as_echo "1228. $at_setup_line: testing $at_desc ..."
+  $as_echo "1231. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -169887,7 +170629,7 @@
               "y": {
                 "type": "integer"}}}},
         "version": "xxx"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -169911,7 +170653,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -169924,13 +170666,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1228
-#AT_START_1229
-at_fn_group_banner 1229 'ovsdb-schema.at:94' \
+#AT_STOP_1231
+#AT_START_1232
+at_fn_group_banner 1232 'ovsdb-schema.at:94' \
   "schema with invalid version number - Python" "    " 73
 at_xfail=no
 (
-  $as_echo "1229. $at_setup_line: testing $at_desc ..."
+  $as_echo "1232. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-schema.at:94" >"$at_check_line_file"
@@ -169955,7 +170697,7 @@
               "y": {
                 "type": "integer"}}}},
         "version": "xxx"}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -169979,7 +170721,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -169992,13 +170734,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1229
-#AT_START_1230
-at_fn_group_banner 1230 'ovsdb-condition.at:3' \
+#AT_STOP_1232
+#AT_START_1233
+at_fn_group_banner 1233 'ovsdb-condition.at:3' \
   "null condition" "                                 " 74
 at_xfail=no
 (
-  $as_echo "1230. $at_setup_line: testing $at_desc ..."
+  $as_echo "1233. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -170010,7 +170752,7 @@
 ( $at_check_trace; test-ovsdb parse-conditions \
     '{"columns": {"name": {"type": "string"}}}' \
     '[]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -170025,13 +170767,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1230
-#AT_START_1231
-at_fn_group_banner 1231 'ovsdb-condition.at:9' \
+#AT_STOP_1233
+#AT_START_1234
+at_fn_group_banner 1234 'ovsdb-condition.at:9' \
   "conditions on scalars" "                          " 74
 at_xfail=no
 (
-  $as_echo "1231. $at_setup_line: testing $at_desc ..."
+  $as_echo "1234. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -170107,7 +170849,7 @@
     '[["u", "!=", ["uuid", "9179ca6d-6d65-400a-b455-3ad92783a099"]]]' \
     '[["u", "includes", ["uuid", "ad0fa355-8b84-4a36-a4b5-b2c1bfd91758"]]]' \
     '[["u", "excludes", ["uuid", "62315898-64e0-40b9-b26f-ff74225303e6"]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -170149,13 +170891,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1231
-#AT_START_1232
-at_fn_group_banner 1232 'ovsdb-condition.at:75' \
+#AT_STOP_1234
+#AT_START_1235
+at_fn_group_banner 1235 'ovsdb-condition.at:75' \
   "disallowed conditions on scalars" "               " 74
 at_xfail=no
 (
-  $as_echo "1232. $at_setup_line: testing $at_desc ..."
+  $as_echo "1235. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -170199,7 +170941,7 @@
     '[["u", ">=", ["uuid", "9179ca6d-6d65-400a-b455-3ad92783a099"]]]' \
     '[["u", "<", ["uuid", "ad0fa355-8b84-4a36-a4b5-b2c1bfd91758"]]]' \
     '[["u", "<=", ["uuid", "62315898-64e0-40b9-b26f-ff74225303e6"]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "test-ovsdb: syntax \"[\"b\",\">\",true]\": syntax error: Type mismatch: \">\" operator may not be applied to column b of type boolean.
@@ -170225,13 +170967,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1232
-#AT_START_1233
-at_fn_group_banner 1233 'ovsdb-condition.at:112' \
+#AT_STOP_1235
+#AT_START_1236
+at_fn_group_banner 1236 'ovsdb-condition.at:112' \
   "conditions on sets" "                             " 74
 at_xfail=no
 (
-  $as_echo "1233. $at_setup_line: testing $at_desc ..."
+  $as_echo "1236. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -170313,7 +171055,7 @@
                 ["uuid", "ad0fa355-8b84-4a36-a4b5-b2c1bfd91758"],
                 ["uuid", "62315898-64e0-40b9-b26f-ff74225303e6"]]]]]' \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -170347,13 +171089,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1233
-#AT_START_1234
-at_fn_group_banner 1234 'ovsdb-condition.at:173' \
+#AT_STOP_1236
+#AT_START_1237
+at_fn_group_banner 1237 'ovsdb-condition.at:173' \
   "condition sorting" "                              " 74
 at_xfail=no
 (
-  $as_echo "1234. $at_setup_line: testing $at_desc ..."
+  $as_echo "1237. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -170381,7 +171123,7 @@
       ["i", ">", 6],
       ["i", ">=", 5],
       ["_uuid", "==", ["uuid", "d50e85c6-8ae7-4b16-b69e-4395928bd9be"]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -170396,13 +171138,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1234
-#AT_START_1235
-at_fn_group_banner 1235 'ovsdb-condition.at:187' \
+#AT_STOP_1237
+#AT_START_1238
+at_fn_group_banner 1238 'ovsdb-condition.at:187' \
   "evaluating null condition" "                      " 74
 at_xfail=no
 (
-  $as_echo "1235. $at_setup_line: testing $at_desc ..."
+  $as_echo "1238. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -170420,7 +171162,7 @@
     '[{"i": 0},
       {"i": 1},
       {"i": 2}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -170435,13 +171177,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1235
-#AT_START_1236
-at_fn_group_banner 1236 'ovsdb-condition.at:196' \
+#AT_STOP_1238
+#AT_START_1239
+at_fn_group_banner 1239 'ovsdb-condition.at:196' \
   "evaluating conditions on integers" "              " 74
 at_xfail=no
 (
-  $as_echo "1236. $at_setup_line: testing $at_desc ..."
+  $as_echo "1239. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -170475,7 +171217,7 @@
     '[{"i": 0},
       {"i": 1},
       {"i": 2}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -170498,13 +171240,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1236
-#AT_START_1237
-at_fn_group_banner 1237 'ovsdb-condition.at:221' \
+#AT_STOP_1239
+#AT_START_1240
+at_fn_group_banner 1240 'ovsdb-condition.at:221' \
   "evaluating conditions on reals" "                 " 74
 at_xfail=no
 (
-  $as_echo "1237. $at_setup_line: testing $at_desc ..."
+  $as_echo "1240. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -170538,7 +171280,7 @@
     '[{"r": 0},
       {"r": 5.0},
       {"r": 5.1}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -170561,13 +171303,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1237
-#AT_START_1238
-at_fn_group_banner 1238 'ovsdb-condition.at:246' \
+#AT_STOP_1240
+#AT_START_1241
+at_fn_group_banner 1241 'ovsdb-condition.at:246' \
   "evaluating conditions on booleans" "              " 74
 at_xfail=no
 (
-  $as_echo "1238. $at_setup_line: testing $at_desc ..."
+  $as_echo "1241. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -170599,7 +171341,7 @@
       [["b", "==", true], ["b", "==", false]]]' \
     '[{"b": true},
       {"b": false}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -170622,13 +171364,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1238
-#AT_START_1239
-at_fn_group_banner 1239 'ovsdb-condition.at:270' \
+#AT_STOP_1241
+#AT_START_1242
+at_fn_group_banner 1242 'ovsdb-condition.at:270' \
   "evaluating conditions on strings" "               " 74
 at_xfail=no
 (
-  $as_echo "1239. $at_setup_line: testing $at_desc ..."
+  $as_echo "1242. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -170662,7 +171404,7 @@
     '[{"s": ""},
       {"s": "foo"},
       {"s": "xxx"}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -170685,13 +171427,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1239
-#AT_START_1240
-at_fn_group_banner 1240 'ovsdb-condition.at:295' \
+#AT_STOP_1242
+#AT_START_1243
+at_fn_group_banner 1243 'ovsdb-condition.at:295' \
   "evaluating conditions on UUIDs" "                 " 74
 at_xfail=no
 (
-  $as_echo "1240. $at_setup_line: testing $at_desc ..."
+  $as_echo "1243. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -170727,7 +171469,7 @@
     '[{"u": ["uuid", "8a1dbdb8-416f-4ce9-affa-3332691714b6"]},
       {"u": ["uuid", "06151f9d-62d6-4f59-8504-e9765107faa9"]},
       {"u": ["uuid", "00000000-0000-0000-0000-000000000000"]}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -170750,13 +171492,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1240
-#AT_START_1241
-at_fn_group_banner 1241 'ovsdb-condition.at:321' \
+#AT_STOP_1243
+#AT_START_1244
+at_fn_group_banner 1244 'ovsdb-condition.at:321' \
   "evaluating conditions on sets" "                  " 74
 at_xfail=no
 (
-  $as_echo "1241. $at_setup_line: testing $at_desc ..."
+  $as_echo "1244. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -170850,7 +171592,7 @@
       {"i": ["set", [2, 0]]},
       {"i": ["set", [2, 1]]},
       {"i": ["set", [2, 1, 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -170897,13 +171639,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1241
-#AT_START_1242
-at_fn_group_banner 1242 'ovsdb-condition.at:403' \
+#AT_STOP_1244
+#AT_START_1245
+at_fn_group_banner 1245 'ovsdb-condition.at:403' \
   "evaluating conditions on maps (1)" "              " 74
 at_xfail=no
 (
-  $as_echo "1242. $at_setup_line: testing $at_desc ..."
+  $as_echo "1245. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171003,7 +171745,7 @@
       {"i": ["map", [[2, true], [0, true]]]},
       {"i": ["map", [[2, true], [1, false]]]},
       {"i": ["map", [[2, true], [1, false], [0, true]]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -171050,13 +171792,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1242
-#AT_START_1243
-at_fn_group_banner 1243 'ovsdb-condition.at:488' \
+#AT_STOP_1245
+#AT_START_1246
+at_fn_group_banner 1246 'ovsdb-condition.at:488' \
   "evaluating conditions on maps (2)" "              " 74
 at_xfail=no
 (
-  $as_echo "1243. $at_setup_line: testing $at_desc ..."
+  $as_echo "1246. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171174,7 +171916,7 @@
       {"i": ["map", [[2, true], [1, true]]]},
       {"i": ["map", [[2, true], [1, false], [0, true]]]},
       {"i": ["map", [[2, true], [1, false], [0, false]]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -171221,13 +171963,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1243
-#AT_START_1244
-at_fn_group_banner 1244 'ovsdb-condition.at:580' \
+#AT_STOP_1246
+#AT_START_1247
+at_fn_group_banner 1247 'ovsdb-condition.at:580' \
   "evaluating conditions on optional integers" "     " 74
 at_xfail=no
 (
-  $as_echo "1244. $at_setup_line: testing $at_desc ..."
+  $as_echo "1247. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171263,7 +172005,7 @@
       {"i": ["set", [0]]},
       {"i": ["set", [1]]},
       {"i": ["set", [2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -171286,13 +172028,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1244
-#AT_START_1245
-at_fn_group_banner 1245 'ovsdb-condition.at:607' \
+#AT_STOP_1247
+#AT_START_1248
+at_fn_group_banner 1248 'ovsdb-condition.at:607' \
   "evaluating conditions on optional strings" "      " 74
 at_xfail=no
 (
-  $as_echo "1245. $at_setup_line: testing $at_desc ..."
+  $as_echo "1248. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171328,7 +172070,7 @@
       {"s": ["set", ["foo"]]},
       {"s": ["set", ["xxx"]]},
       {"s": ["set", []]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -171351,13 +172093,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1245
-#AT_START_1246
-at_fn_group_banner 1246 'ovsdb-condition.at:634' \
+#AT_STOP_1248
+#AT_START_1249
+at_fn_group_banner 1249 'ovsdb-condition.at:634' \
   "evaluating conditions on optional reals" "        " 74
 at_xfail=no
 (
-  $as_echo "1246. $at_setup_line: testing $at_desc ..."
+  $as_echo "1249. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171393,7 +172135,7 @@
       {"r": ["set", [5.0]]},
       {"r": ["set", [5.1]]},
       {"r": ["set", []]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -171416,13 +172158,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1246
-#AT_START_1247
-at_fn_group_banner 1247 'ovsdb-mutation.at:3' \
+#AT_STOP_1249
+#AT_START_1250
+at_fn_group_banner 1250 'ovsdb-mutation.at:3' \
   "null mutation" "                                  " 75
 at_xfail=no
 (
-  $as_echo "1247. $at_setup_line: testing $at_desc ..."
+  $as_echo "1250. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171434,7 +172176,7 @@
 ( $at_check_trace; test-ovsdb parse-mutations \
     '{"columns": {"name": {"type": "string"}}}' \
     '[]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -171449,13 +172191,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1247
-#AT_START_1248
-at_fn_group_banner 1248 'ovsdb-mutation.at:9' \
+#AT_STOP_1250
+#AT_START_1251
+at_fn_group_banner 1251 'ovsdb-mutation.at:9' \
   "mutations on scalars" "                           " 75
 at_xfail=no
 (
-  $as_echo "1248. $at_setup_line: testing $at_desc ..."
+  $as_echo "1251. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171493,7 +172235,7 @@
     '[["r", "-=", 1.5]]' \
     '[["r", "*=", 2.5]]' \
     '[["r", "/=", 3.5]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -171516,13 +172258,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1248
-#AT_START_1249
-at_fn_group_banner 1249 'ovsdb-mutation.at:37' \
+#AT_STOP_1251
+#AT_START_1252
+at_fn_group_banner 1252 'ovsdb-mutation.at:37' \
   "disallowed mutations on scalars" "                " 75
 at_xfail=no
 (
-  $as_echo "1249. $at_setup_line: testing $at_desc ..."
+  $as_echo "1252. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171594,7 +172336,7 @@
     '[["u", "/=", ["uuid", "9179ca6d-6d65-400a-b455-3ad92783a099"]]]' \
     '[["u", "insert", ["uuid", "9179ca6d-6d65-400a-b455-3ad92783a099"]]]' \
     '[["u", "delete", ["uuid", "9179ca6d-6d65-400a-b455-3ad92783a099"]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "test-ovsdb: unknown mutator: No mutator named xxx.
@@ -171634,13 +172376,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1249
-#AT_START_1250
-at_fn_group_banner 1250 'ovsdb-mutation.at:102' \
+#AT_STOP_1252
+#AT_START_1253
+at_fn_group_banner 1253 'ovsdb-mutation.at:102' \
   "disallowed mutations on immutable columns" "      " 75
 at_xfail=no
 (
-  $as_echo "1250. $at_setup_line: testing $at_desc ..."
+  $as_echo "1253. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171656,7 +172398,7 @@
         {"i": {"type": "integer", "mutable": false}}}' \
     '[["i", "+=", 1]]'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "test-ovsdb: syntax \"[\"i\",\"+=\",1]\": constraint violation: Cannot mutate immutable column i in table mytable.
@@ -171671,13 +172413,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1250
-#AT_START_1251
-at_fn_group_banner 1251 'ovsdb-mutation.at:114' \
+#AT_STOP_1253
+#AT_START_1254
+at_fn_group_banner 1254 'ovsdb-mutation.at:114' \
   "mutations on sets" "                              " 75
 at_xfail=no
 (
-  $as_echo "1251. $at_setup_line: testing $at_desc ..."
+  $as_echo "1254. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171743,7 +172485,7 @@
        ["set", [["uuid", "b10d28f7-af18-4a67-9e78-2a6394516c59"],
                 ["uuid", "9179ca6d-6d65-400a-b455-3ad92783a099"]]]]]' \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -171776,13 +172518,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1251
-#AT_START_1252
-at_fn_group_banner 1252 'ovsdb-mutation.at:166' \
+#AT_STOP_1254
+#AT_START_1255
+at_fn_group_banner 1255 'ovsdb-mutation.at:166' \
   "executing null mutation" "                        " 75
 at_xfail=no
 (
-  $as_echo "1252. $at_setup_line: testing $at_desc ..."
+  $as_echo "1255. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171800,7 +172542,7 @@
     '[{"i": 0},
       {"i": 1},
       {"i": 2}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -171819,13 +172561,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1252
-#AT_START_1253
-at_fn_group_banner 1253 'ovsdb-mutation.at:179' \
+#AT_STOP_1255
+#AT_START_1256
+at_fn_group_banner 1256 'ovsdb-mutation.at:179' \
   "executing mutations on integers" "                " 75
 at_xfail=no
 (
-  $as_echo "1253. $at_setup_line: testing $at_desc ..."
+  $as_echo "1256. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171851,7 +172593,7 @@
     '[{"i": 0},
       {"i": 1},
       {"i": 2}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -171890,13 +172632,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1253
-#AT_START_1254
-at_fn_group_banner 1254 'ovsdb-mutation.at:216' \
+#AT_STOP_1256
+#AT_START_1257
+at_fn_group_banner 1257 'ovsdb-mutation.at:216' \
   "integer overflow detection" "                     " 75
 at_xfail=no
 (
-  $as_echo "1254. $at_setup_line: testing $at_desc ..."
+  $as_echo "1257. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -171934,7 +172676,7 @@
       {"i": -9223372036854775808},
       {"i": 3037000500},
       {"i": -3037000500}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -172011,13 +172753,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1254
-#AT_START_1255
-at_fn_group_banner 1255 'ovsdb-mutation.at:297' \
+#AT_STOP_1257
+#AT_START_1258
+at_fn_group_banner 1258 'ovsdb-mutation.at:297' \
   "executing mutations on integers with constraints" "" 75
 at_xfail=no
 (
-  $as_echo "1255. $at_setup_line: testing $at_desc ..."
+  $as_echo "1258. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -172047,7 +172789,7 @@
     '[{"i": 0},
       {"i": 1},
       {"i": 2}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -172086,13 +172828,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1255
-#AT_START_1256
-at_fn_group_banner 1256 'ovsdb-mutation.at:336' \
+#AT_STOP_1258
+#AT_START_1259
+at_fn_group_banner 1259 'ovsdb-mutation.at:336' \
   "executing mutations on reals" "                   " 75
 at_xfail=no
 (
-  $as_echo "1256. $at_setup_line: testing $at_desc ..."
+  $as_echo "1259. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -172116,7 +172858,7 @@
     '[{"r": 0},
       {"r": -2.5},
       {"r": 1.25}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -172150,13 +172892,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1256
-#AT_START_1257
-at_fn_group_banner 1257 'ovsdb-mutation.at:367' \
+#AT_STOP_1259
+#AT_START_1260
+at_fn_group_banner 1260 'ovsdb-mutation.at:367' \
   "real overflow detection" "                        " 75
 at_xfail=no
 (
-  $as_echo "1257. $at_setup_line: testing $at_desc ..."
+  $as_echo "1260. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -172184,7 +172926,7 @@
     '[{"r": 0},
       {"r": 1.7976931348623157e+308},
       {"r": -1.7976931348623157e+308}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -172228,13 +172970,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1257
-#AT_START_1258
-at_fn_group_banner 1258 'ovsdb-mutation.at:410' \
+#AT_STOP_1260
+#AT_START_1261
+at_fn_group_banner 1261 'ovsdb-mutation.at:410' \
   "executing mutations on reals with constraints" "  " 75
 at_xfail=no
 (
-  $as_echo "1258. $at_setup_line: testing $at_desc ..."
+  $as_echo "1261. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -172262,7 +173004,7 @@
     '[{"r": 0},
       {"r": -2.5},
       {"r": 1.25}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -172296,13 +173038,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1258
-#AT_START_1259
-at_fn_group_banner 1259 'ovsdb-mutation.at:443' \
+#AT_STOP_1261
+#AT_START_1262
+at_fn_group_banner 1262 'ovsdb-mutation.at:443' \
   "executing mutations on integer sets" "            " 75
 at_xfail=no
 (
-  $as_echo "1259. $at_setup_line: testing $at_desc ..."
+  $as_echo "1262. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -172344,7 +173086,7 @@
       {"i": ["set", [0]]},
       {"i": ["set", [0, 1]]},
       {"i": ["set", [0, 1, 2]]}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -172412,13 +173154,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1259
-#AT_START_1260
-at_fn_group_banner 1260 'ovsdb-mutation.at:517' \
+#AT_STOP_1262
+#AT_START_1263
+at_fn_group_banner 1263 'ovsdb-mutation.at:517' \
   "executing mutations on integer sets with constraints" "" 75
 at_xfail=no
 (
-  $as_echo "1260. $at_setup_line: testing $at_desc ..."
+  $as_echo "1263. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -172448,7 +173190,7 @@
     '[{"i": ["set", [0]]},
       {"i": ["set", [2]]},
       {"i": ["set", [0, 1]]}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -172487,13 +173229,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1260
-#AT_START_1261
-at_fn_group_banner 1261 'ovsdb-mutation.at:556' \
+#AT_STOP_1263
+#AT_START_1264
+at_fn_group_banner 1264 'ovsdb-mutation.at:556' \
   "executing mutations on real sets" "               " 75
 at_xfail=no
 (
-  $as_echo "1261. $at_setup_line: testing $at_desc ..."
+  $as_echo "1264. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -172533,7 +173275,7 @@
       {"r": 0.5},
       {"r": ["set", [0.5, 1.5]]},
       {"r": ["set", [0.5, 1.5, 2.5]]}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -172601,13 +173343,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1261
-#AT_START_1262
-at_fn_group_banner 1262 'ovsdb-mutation.at:629' \
+#AT_STOP_1264
+#AT_START_1265
+at_fn_group_banner 1265 'ovsdb-mutation.at:629' \
   "executing mutations on boolean sets" "            " 75
 at_xfail=no
 (
-  $as_echo "1262. $at_setup_line: testing $at_desc ..."
+  $as_echo "1265. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -172637,7 +173379,7 @@
       {"b": ["set", [false]]},
       {"b": ["set", [true]]},
       {"b": ["set", [false, true]]}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -172687,13 +173429,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1262
-#AT_START_1263
-at_fn_group_banner 1263 'ovsdb-mutation.at:679' \
+#AT_STOP_1265
+#AT_START_1266
+at_fn_group_banner 1266 'ovsdb-mutation.at:679' \
   "executing mutations on string sets" "             " 75
 at_xfail=no
 (
-  $as_echo "1263. $at_setup_line: testing $at_desc ..."
+  $as_echo "1266. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -172723,7 +173465,7 @@
       {"s": ["set", ["a"]]},
       {"s": ["set", ["a", "b"]]},
       {"s": ["set", ["a", "b", "c", "d"]]}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -172773,13 +173515,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1263
-#AT_START_1264
-at_fn_group_banner 1264 'ovsdb-mutation.at:729' \
+#AT_STOP_1266
+#AT_START_1267
+at_fn_group_banner 1267 'ovsdb-mutation.at:729' \
   "executing mutations on uuid sets" "               " 75
 at_xfail=no
 (
-  $as_echo "1264. $at_setup_line: testing $at_desc ..."
+  $as_echo "1267. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -172809,7 +173551,7 @@
       {"u": ["set", [["uuid", "ddd9e79d-7782-414c-8b22-1046c60b6ec2"]]]},
       {"u": ["set", [["uuid", "a60fe7ff-317b-4568-9106-892b37445313"]]]},
       {"u": ["set", [["uuid", "2607d30e-e652-4927-9fec-8bbf1b60c7e9"]]]}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -172859,13 +173601,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1264
-#AT_START_1265
-at_fn_group_banner 1265 'ovsdb-mutation.at:779' \
+#AT_STOP_1267
+#AT_START_1268
+at_fn_group_banner 1268 'ovsdb-mutation.at:779' \
   "executing mutations on integer maps" "            " 75
 at_xfail=no
 (
-  $as_echo "1265. $at_setup_line: testing $at_desc ..."
+  $as_echo "1268. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -172895,7 +173637,7 @@
       {"i": ["map", [[1, 2]]]},
       {"i": ["map", [[1, 3], [2, 3]]]},
       {"i": ["map", [[3, 5]]]}']
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -172945,13 +173687,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1265
-#AT_START_1266
-at_fn_group_banner 1266 'ovsdb-query.at:3' \
+#AT_STOP_1268
+#AT_START_1269
+at_fn_group_banner 1269 'ovsdb-query.at:3' \
   "queries on scalars" "                             " 76
 at_xfail=no
 (
-  $as_echo "1266. $at_setup_line: testing $at_desc ..."
+  $as_echo "1269. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -173077,7 +173819,7 @@
       [["u", "==", ["uuid", "b10d28f7-af18-4a67-9e78-2a6394516c59"]]],
       [["u", "!=", ["uuid", "9179ca6d-6d65-400a-b455-3ad92783a099"]]],
       [["u", "includes",["uuid", "ad0fa355-8b84-4a36-a4b5-b2c1bfd91758"]]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -173119,13 +173861,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1266
-#AT_START_1267
-at_fn_group_banner 1267 'ovsdb-query.at:95' \
+#AT_STOP_1269
+#AT_START_1270
+at_fn_group_banner 1270 'ovsdb-query.at:95' \
   "queries on sets" "                                " 76
 at_xfail=no
 (
-  $as_echo "1267. $at_setup_line: testing $at_desc ..."
+  $as_echo "1270. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -173217,7 +173959,7 @@
       [["i", "excludes", ["set", [2, 0]]]],
       [["i", "excludes", ["set", [2, 1]]]],
       [["i", "excludes", ["set", [2, 1, 0]]]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -173264,13 +174006,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1267
-#AT_START_1268
-at_fn_group_banner 1268 'ovsdb-query.at:176' \
+#AT_STOP_1270
+#AT_START_1271
+at_fn_group_banner 1271 'ovsdb-query.at:176' \
   "queries on maps (1)" "                            " 76
 at_xfail=no
 (
-  $as_echo "1268. $at_setup_line: testing $at_desc ..."
+  $as_echo "1271. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -173368,7 +174110,7 @@
       [["i", "excludes", ["map", [[2, true], [0, true]]]]],
       [["i", "excludes", ["map", [[2, true], [1, false]]]]],
       [["i", "excludes", ["map", [[2, true], [1, false], [0, true]]]]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -173415,13 +174157,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1268
-#AT_START_1269
-at_fn_group_banner 1269 'ovsdb-query.at:260' \
+#AT_STOP_1271
+#AT_START_1272
+at_fn_group_banner 1272 'ovsdb-query.at:260' \
   "queries on maps (2)" "                            " 76
 at_xfail=no
 (
-  $as_echo "1269. $at_setup_line: testing $at_desc ..."
+  $as_echo "1272. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -173537,7 +174279,7 @@
       [["i", "excludes", ["map", [[2, true], [0, true]]]]],
       [["i", "excludes", ["map", [[2, true], [1, false]]]]],
       [["i", "excludes", ["map", [[2, true], [1, false], [0, true]]]]]]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -173584,13 +174326,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1269
-#AT_START_1270
-at_fn_group_banner 1270 'ovsdb-query.at:351' \
+#AT_STOP_1272
+#AT_START_1273
+at_fn_group_banner 1273 'ovsdb-query.at:351' \
   "UUID-distinct queries on scalars" "               " 76
 at_xfail=no
 (
-  $as_echo "1270. $at_setup_line: testing $at_desc ..."
+  $as_echo "1273. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -173718,7 +174460,7 @@
       [["u", "!=", ["uuid", "9179ca6d-6d65-400a-b455-3ad92783a099"]]],
       [["u", "includes",["uuid", "ad0fa355-8b84-4a36-a4b5-b2c1bfd91758"]]]]' \
     '["_uuid"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -173760,13 +174502,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1270
-#AT_START_1271
-at_fn_group_banner 1271 'ovsdb-query.at:444' \
+#AT_STOP_1273
+#AT_START_1274
+at_fn_group_banner 1274 'ovsdb-query.at:444' \
   "Boolean-distinct queries on scalars" "            " 76
 at_xfail=no
 (
-  $as_echo "1271. $at_setup_line: testing $at_desc ..."
+  $as_echo "1274. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -173894,7 +174636,7 @@
       [["u", "!=", ["uuid", "9179ca6d-6d65-400a-b455-3ad92783a099"]]],
       [["u", "includes",["uuid", "ad0fa355-8b84-4a36-a4b5-b2c1bfd91758"]]]]' \
     '["b"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -173936,13 +174678,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1271
-#AT_START_1272
-at_fn_group_banner 1272 'ovsdb-query.at:537' \
+#AT_STOP_1274
+#AT_START_1275
+at_fn_group_banner 1275 'ovsdb-query.at:537' \
   "parse colunn set containing bad name" "           " 76
 at_xfail=no
 (
-  $as_echo "1272. $at_setup_line: testing $at_desc ..."
+  $as_echo "1275. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -173958,7 +174700,7 @@
     '[{"i": 0}]' \
     '[[]]' \
     '["i", "bad"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -173982,7 +174724,7 @@
       else
         exit 99
       fi
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -173995,13 +174737,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1272
-#AT_START_1273
-at_fn_group_banner 1273 'ovsdb-transaction.at:3' \
+#AT_STOP_1275
+#AT_START_1276
+at_fn_group_banner 1276 'ovsdb-transaction.at:3' \
   "empty table, empty transaction" "                 " 77
 at_xfail=no
 (
-  $as_echo "1273. $at_setup_line: testing $at_desc ..."
+  $as_echo "1276. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174019,7 +174761,7 @@
     '["print"]' \
     '["abort"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174038,13 +174780,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1273
-#AT_START_1274
-at_fn_group_banner 1274 'ovsdb-transaction.at:17' \
+#AT_STOP_1276
+#AT_START_1277
+at_fn_group_banner 1277 'ovsdb-transaction.at:17' \
   "nonempty table, empty transaction" "              " 77
 at_xfail=no
 (
-  $as_echo "1274. $at_setup_line: testing $at_desc ..."
+  $as_echo "1277. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174066,7 +174808,7 @@
     '["print"]' \
     '["abort"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174093,13 +174835,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1274
-#AT_START_1275
-at_fn_group_banner 1275 'ovsdb-transaction.at:41' \
+#AT_STOP_1277
+#AT_START_1278
+at_fn_group_banner 1278 'ovsdb-transaction.at:41' \
   "insert, commit" "                                 " 77
 at_xfail=no
 (
-  $as_echo "1275. $at_setup_line: testing $at_desc ..."
+  $as_echo "1278. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174123,7 +174865,7 @@
     '["print"]' \
     '["commit"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174153,13 +174895,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1275
-#AT_START_1276
-at_fn_group_banner 1276 'ovsdb-transaction.at:70' \
+#AT_STOP_1278
+#AT_START_1279
+at_fn_group_banner 1279 'ovsdb-transaction.at:70' \
   "insert, abort" "                                  " 77
 at_xfail=no
 (
-  $as_echo "1276. $at_setup_line: testing $at_desc ..."
+  $as_echo "1279. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174183,7 +174925,7 @@
     '["print"]' \
     '["abort"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174212,13 +174954,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1276
-#AT_START_1277
-at_fn_group_banner 1277 'ovsdb-transaction.at:98' \
+#AT_STOP_1279
+#AT_START_1280
+at_fn_group_banner 1280 'ovsdb-transaction.at:98' \
   "modify, commit" "                                 " 77
 at_xfail=no
 (
-  $as_echo "1277. $at_setup_line: testing $at_desc ..."
+  $as_echo "1280. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174244,7 +174986,7 @@
     '["print"]' \
     '["commit"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174273,13 +175015,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1277
-#AT_START_1278
-at_fn_group_banner 1278 'ovsdb-transaction.at:127' \
+#AT_STOP_1280
+#AT_START_1281
+at_fn_group_banner 1281 'ovsdb-transaction.at:127' \
   "modify, abort" "                                  " 77
 at_xfail=no
 (
-  $as_echo "1278. $at_setup_line: testing $at_desc ..."
+  $as_echo "1281. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174305,7 +175047,7 @@
     '["print"]' \
     '["abort"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174334,13 +175076,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1278
-#AT_START_1279
-at_fn_group_banner 1279 'ovsdb-transaction.at:156' \
+#AT_STOP_1281
+#AT_START_1282
+at_fn_group_banner 1282 'ovsdb-transaction.at:156' \
   "delete, commit" "                                 " 77
 at_xfail=no
 (
-  $as_echo "1279. $at_setup_line: testing $at_desc ..."
+  $as_echo "1282. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174364,7 +175106,7 @@
     '["print"]' \
     '["commit"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174390,13 +175132,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1279
-#AT_START_1280
-at_fn_group_banner 1280 'ovsdb-transaction.at:181' \
+#AT_STOP_1282
+#AT_START_1283
+at_fn_group_banner 1283 'ovsdb-transaction.at:181' \
   "delete, abort" "                                  " 77
 at_xfail=no
 (
-  $as_echo "1280. $at_setup_line: testing $at_desc ..."
+  $as_echo "1283. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174420,7 +175162,7 @@
     '["print"]' \
     '["abort"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174447,13 +175189,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1280
-#AT_START_1281
-at_fn_group_banner 1281 'ovsdb-transaction.at:207' \
+#AT_STOP_1283
+#AT_START_1284
+at_fn_group_banner 1284 'ovsdb-transaction.at:207' \
   "modify, delete, commit" "                         " 77
 at_xfail=no
 (
-  $as_echo "1281. $at_setup_line: testing $at_desc ..."
+  $as_echo "1284. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174479,7 +175221,7 @@
     '["print"]' \
     '["commit"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174506,13 +175248,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1281
-#AT_START_1282
-at_fn_group_banner 1282 'ovsdb-transaction.at:234' \
+#AT_STOP_1284
+#AT_START_1285
+at_fn_group_banner 1285 'ovsdb-transaction.at:234' \
   "modify, delete, abort" "                          " 77
 at_xfail=no
 (
-  $as_echo "1282. $at_setup_line: testing $at_desc ..."
+  $as_echo "1285. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174538,7 +175280,7 @@
     '["print"]' \
     '["abort"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174566,13 +175308,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1282
-#AT_START_1283
-at_fn_group_banner 1283 'ovsdb-transaction.at:262' \
+#AT_STOP_1285
+#AT_START_1286
+at_fn_group_banner 1286 'ovsdb-transaction.at:262' \
   "insert, delete, commit" "                         " 77
 at_xfail=no
 (
-  $as_echo "1283. $at_setup_line: testing $at_desc ..."
+  $as_echo "1286. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174600,7 +175342,7 @@
     '["print"]' \
     '["commit"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174628,13 +175370,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1283
-#AT_START_1284
-at_fn_group_banner 1284 'ovsdb-transaction.at:291' \
+#AT_STOP_1286
+#AT_START_1287
+at_fn_group_banner 1287 'ovsdb-transaction.at:291' \
   "insert, delete, abort" "                          " 77
 at_xfail=no
 (
-  $as_echo "1284. $at_setup_line: testing $at_desc ..."
+  $as_echo "1287. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174662,7 +175404,7 @@
     '["print"]' \
     '["abort"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174691,13 +175433,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1284
-#AT_START_1285
-at_fn_group_banner 1285 'ovsdb-transaction.at:322' \
+#AT_STOP_1287
+#AT_START_1288
+at_fn_group_banner 1288 'ovsdb-transaction.at:322' \
   "insert, modify, delete, commit" "                 " 77
 at_xfail=no
 (
-  $as_echo "1285. $at_setup_line: testing $at_desc ..."
+  $as_echo "1288. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174727,7 +175469,7 @@
     '["print"]' \
     '["commit"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174756,13 +175498,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1285
-#AT_START_1286
-at_fn_group_banner 1286 'ovsdb-transaction.at:353' \
+#AT_STOP_1288
+#AT_START_1289
+at_fn_group_banner 1289 'ovsdb-transaction.at:353' \
   "insert, modify, delete, abort" "                  " 77
 at_xfail=no
 (
-  $as_echo "1286. $at_setup_line: testing $at_desc ..."
+  $as_echo "1289. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174792,7 +175534,7 @@
     '["print"]' \
     '["abort"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174822,13 +175564,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1286
-#AT_START_1287
-at_fn_group_banner 1287 'ovsdb-transaction.at:385' \
+#AT_STOP_1289
+#AT_START_1290
+at_fn_group_banner 1290 'ovsdb-transaction.at:385' \
   "deletes are aborted cleanly" "                    " 77
 at_xfail=no
 (
-  $as_echo "1287. $at_setup_line: testing $at_desc ..."
+  $as_echo "1290. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174854,7 +175596,7 @@
     '["delete", "1"]' \
     '["abort"]' \
     '["print"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174880,13 +175622,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1287
-#AT_START_1288
-at_fn_group_banner 1288 'ovsdb-execution.at:147' \
+#AT_STOP_1290
+#AT_START_1291
+at_fn_group_banner 1291 'ovsdb-execution.at:147' \
   "uuid-name must be " "                         " 78
 at_xfail=no
 (
-  $as_echo "1288. $at_setup_line: testing $at_desc ..."
+  $as_echo "1291. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174903,7 +175645,7 @@
        "table": "a",
        "row": {},
        "uuid-name": "0"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174916,7 +175658,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:147: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:147"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174931,13 +175673,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1288
-#AT_START_1289
-at_fn_group_banner 1289 'ovsdb-execution.at:157' \
+#AT_STOP_1291
+#AT_START_1292
+at_fn_group_banner 1292 'ovsdb-execution.at:157' \
   "named-uuid must be " "                        " 78
 at_xfail=no
 (
-  $as_echo "1289. $at_setup_line: testing $at_desc ..."
+  $as_echo "1292. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -174952,7 +175694,7 @@
       {"op": "insert",
        "table": "a",
        "row": {"a2a": ["named-uuid", "0"]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174965,7 +175707,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:157: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:157"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -174980,13 +175722,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1289
-#AT_START_1290
-at_fn_group_banner 1290 'ovsdb-execution.at:166' \
+#AT_STOP_1292
+#AT_START_1293
+at_fn_group_banner 1293 'ovsdb-execution.at:166' \
   "duplicate uuid-name not allowed" "                " 78
 at_xfail=no
 (
-  $as_echo "1290. $at_setup_line: testing $at_desc ..."
+  $as_echo "1293. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175011,7 +175753,7 @@
        "table": "ordinals",
        "row": {},
        "uuid-name": "x"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175024,7 +175766,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:166: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:166"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175039,13 +175781,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1290
-#AT_START_1291
-at_fn_group_banner 1291 'ovsdb-execution.at:1102' \
+#AT_STOP_1293
+#AT_START_1294
+at_fn_group_banner 1294 'ovsdb-execution.at:1102' \
   "insert default row, query table" "                " 78
 at_xfail=no
 (
-  $as_echo "1291. $at_setup_line: testing $at_desc ..."
+  $as_echo "1294. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175066,7 +175808,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175079,7 +175821,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175095,13 +175837,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1291
-#AT_START_1292
-at_fn_group_banner 1292 'ovsdb-execution.at:1102' \
+#AT_STOP_1294
+#AT_START_1295
+at_fn_group_banner 1295 'ovsdb-execution.at:1102' \
   "insert row, query table" "                        " 78
 at_xfail=no
 (
-  $as_echo "1292. $at_setup_line: testing $at_desc ..."
+  $as_echo "1295. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175122,7 +175864,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175135,7 +175877,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175151,13 +175893,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1292
-#AT_START_1293
-at_fn_group_banner 1293 'ovsdb-execution.at:1102' \
+#AT_STOP_1295
+#AT_START_1296
+at_fn_group_banner 1296 'ovsdb-execution.at:1102' \
   "insert rows, query by value" "                    " 78
 at_xfail=no
 (
-  $as_echo "1293. $at_setup_line: testing $at_desc ..."
+  $as_echo "1296. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175190,7 +175932,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["name", "==", "one"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175203,7 +175945,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175221,13 +175963,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1293
-#AT_START_1294
-at_fn_group_banner 1294 'ovsdb-execution.at:1102' \
+#AT_STOP_1296
+#AT_START_1297
+at_fn_group_banner 1297 'ovsdb-execution.at:1102' \
   "insert rows, query by named-uuid" "               " 78
 at_xfail=no
 (
-  $as_echo "1294. $at_setup_line: testing $at_desc ..."
+  $as_echo "1297. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175264,7 +176006,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["_uuid", "==", ["named-uuid", "second"]]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175277,7 +176019,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175292,13 +176034,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1294
-#AT_START_1295
-at_fn_group_banner 1295 'ovsdb-execution.at:1102' \
+#AT_STOP_1297
+#AT_START_1298
+at_fn_group_banner 1298 'ovsdb-execution.at:1102' \
   "insert rows, update rows by value" "              " 78
 at_xfail=no
 (
-  $as_echo "1295. $at_setup_line: testing $at_desc ..."
+  $as_echo "1298. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175339,7 +176081,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175352,7 +176094,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175370,13 +176112,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1295
-#AT_START_1296
-at_fn_group_banner 1296 'ovsdb-execution.at:1102' \
+#AT_STOP_1298
+#AT_START_1299
+at_fn_group_banner 1299 'ovsdb-execution.at:1102' \
   "insert rows, mutate rows" "                       " 78
 at_xfail=no
 (
-  $as_echo "1296. $at_setup_line: testing $at_desc ..."
+  $as_echo "1299. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175417,7 +176159,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175430,7 +176172,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175448,13 +176190,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1296
-#AT_START_1297
-at_fn_group_banner 1297 'ovsdb-execution.at:1102' \
+#AT_STOP_1299
+#AT_START_1300
+at_fn_group_banner 1300 'ovsdb-execution.at:1102' \
   "insert rows, delete by named-uuid" "              " 78
 at_xfail=no
 (
-  $as_echo "1297. $at_setup_line: testing $at_desc ..."
+  $as_echo "1300. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175493,7 +176235,7 @@
        "table": "ordinals",
        "where": [],
        "columns": ["name","number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175506,7 +176248,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175521,13 +176263,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1297
-#AT_START_1298
-at_fn_group_banner 1298 'ovsdb-execution.at:1102' \
+#AT_STOP_1300
+#AT_START_1301
+at_fn_group_banner 1301 'ovsdb-execution.at:1102' \
   "insert rows, delete rows by value" "              " 78
 at_xfail=no
 (
-  $as_echo "1298. $at_setup_line: testing $at_desc ..."
+  $as_echo "1301. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175564,7 +176306,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175577,7 +176319,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175595,13 +176337,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1298
-#AT_START_1299
-at_fn_group_banner 1299 'ovsdb-execution.at:1102' \
+#AT_STOP_1301
+#AT_START_1302
+at_fn_group_banner 1302 'ovsdb-execution.at:1102' \
   "insert rows, delete by (non-matching) value" "    " 78
 at_xfail=no
 (
-  $as_echo "1299. $at_setup_line: testing $at_desc ..."
+  $as_echo "1302. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175640,7 +176382,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175653,7 +176395,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175671,13 +176413,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1299
-#AT_START_1300
-at_fn_group_banner 1300 'ovsdb-execution.at:1102' \
+#AT_STOP_1302
+#AT_START_1303
+at_fn_group_banner 1303 'ovsdb-execution.at:1102' \
   "insert rows, delete all" "                        " 78
 at_xfail=no
 (
-  $as_echo "1300. $at_setup_line: testing $at_desc ..."
+  $as_echo "1303. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175716,7 +176458,7 @@
        "table": "ordinals",
        "where": [],
        "columns": ["name","number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175729,7 +176471,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175744,13 +176486,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1300
-#AT_START_1301
-at_fn_group_banner 1301 'ovsdb-execution.at:1102' \
+#AT_STOP_1303
+#AT_START_1304
+at_fn_group_banner 1304 'ovsdb-execution.at:1102' \
   "insert row, query table, commit" "                " 78
 at_xfail=no
 (
-  $as_echo "1301. $at_setup_line: testing $at_desc ..."
+  $as_echo "1304. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175775,7 +176517,7 @@
        "where": []},
       {"op": "commit",
        "durable": false}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175788,7 +176530,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175803,13 +176545,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1301
-#AT_START_1302
-at_fn_group_banner 1302 'ovsdb-execution.at:1102' \
+#AT_STOP_1304
+#AT_START_1305
+at_fn_group_banner 1305 'ovsdb-execution.at:1102' \
   "insert row, query table, commit durably" "        " 78
 at_xfail=no
 (
-  $as_echo "1302. $at_setup_line: testing $at_desc ..."
+  $as_echo "1305. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175834,7 +176576,7 @@
        "where": []},
       {"op": "commit",
        "durable": true}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175847,7 +176589,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175862,13 +176604,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1302
-#AT_START_1303
-at_fn_group_banner 1303 'ovsdb-execution.at:1102' \
+#AT_STOP_1305
+#AT_START_1306
+at_fn_group_banner 1306 'ovsdb-execution.at:1102' \
   "equality wait with correct rows" "                " 78
 at_xfail=no
 (
-  $as_echo "1303. $at_setup_line: testing $at_desc ..."
+  $as_echo "1306. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175905,7 +176647,7 @@
        "until": "==",
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175918,7 +176660,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175933,13 +176675,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1303
-#AT_START_1304
-at_fn_group_banner 1304 'ovsdb-execution.at:1102' \
+#AT_STOP_1306
+#AT_START_1307
+at_fn_group_banner 1307 'ovsdb-execution.at:1102' \
   "equality wait with extra row" "                   " 78
 at_xfail=no
 (
-  $as_echo "1304. $at_setup_line: testing $at_desc ..."
+  $as_echo "1307. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -175978,7 +176720,7 @@
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1},
                 {"name": "two", "number": 2}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -175991,7 +176733,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176006,13 +176748,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1304
-#AT_START_1305
-at_fn_group_banner 1305 'ovsdb-execution.at:1102' \
+#AT_STOP_1307
+#AT_START_1308
+at_fn_group_banner 1308 'ovsdb-execution.at:1102' \
   "equality wait with missing row" "                 " 78
 at_xfail=no
 (
-  $as_echo "1305. $at_setup_line: testing $at_desc ..."
+  $as_echo "1308. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -176047,7 +176789,7 @@
        "columns": ["name", "number"],
        "until": "==",
        "rows": [{"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176060,7 +176802,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176075,13 +176817,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1305
-#AT_START_1306
-at_fn_group_banner 1306 'ovsdb-execution.at:1102' \
+#AT_STOP_1308
+#AT_START_1309
+at_fn_group_banner 1309 'ovsdb-execution.at:1102' \
   "inequality wait with correct rows" "              " 78
 at_xfail=no
 (
-  $as_echo "1306. $at_setup_line: testing $at_desc ..."
+  $as_echo "1309. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -176118,7 +176860,7 @@
        "until": "!=",
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176131,7 +176873,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176146,13 +176888,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1306
-#AT_START_1307
-at_fn_group_banner 1307 'ovsdb-execution.at:1102' \
+#AT_STOP_1309
+#AT_START_1310
+at_fn_group_banner 1310 'ovsdb-execution.at:1102' \
   "inequality wait with extra row" "                 " 78
 at_xfail=no
 (
-  $as_echo "1307. $at_setup_line: testing $at_desc ..."
+  $as_echo "1310. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -176191,7 +176933,7 @@
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1},
                 {"name": "two", "number": 2}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176204,7 +176946,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176219,13 +176961,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1307
-#AT_START_1308
-at_fn_group_banner 1308 'ovsdb-execution.at:1102' \
+#AT_STOP_1310
+#AT_START_1311
+at_fn_group_banner 1311 'ovsdb-execution.at:1102' \
   "inequality wait with missing row" "               " 78
 at_xfail=no
 (
-  $as_echo "1308. $at_setup_line: testing $at_desc ..."
+  $as_echo "1311. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -176260,7 +177002,7 @@
        "columns": ["name", "number"],
        "until": "!=",
        "rows": [{"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176273,7 +177015,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176288,13 +177030,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1308
-#AT_START_1309
-at_fn_group_banner 1309 'ovsdb-execution.at:1102' \
+#AT_STOP_1311
+#AT_START_1312
+at_fn_group_banner 1312 'ovsdb-execution.at:1102' \
   "insert and update constraints" "                  " 78
 at_xfail=no
 (
-  $as_echo "1309. $at_setup_line: testing $at_desc ..."
+  $as_echo "1312. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -176335,7 +177077,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": 2}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176348,7 +177090,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176367,13 +177109,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1309
-#AT_START_1310
-at_fn_group_banner 1310 'ovsdb-execution.at:1102' \
+#AT_STOP_1312
+#AT_START_1313
+at_fn_group_banner 1313 'ovsdb-execution.at:1102' \
   "index uniqueness checking" "                      " 78
 at_xfail=no
 (
-  $as_echo "1310. $at_setup_line: testing $at_desc ..."
+  $as_echo "1313. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -176484,7 +177226,7 @@
        "where": [],
        "columns": ["number", "name"],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176497,7 +177239,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176519,13 +177261,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1310
-#AT_START_1311
-at_fn_group_banner 1311 'ovsdb-execution.at:1102' \
+#AT_STOP_1313
+#AT_START_1314
+at_fn_group_banner 1314 'ovsdb-execution.at:1102' \
   "referential integrity -- simple" "                " 78
 at_xfail=no
 (
-  $as_echo "1311. $at_setup_line: testing $at_desc ..."
+  $as_echo "1314. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -176616,7 +177358,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176629,7 +177371,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176652,13 +177394,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1311
-#AT_START_1312
-at_fn_group_banner 1312 'ovsdb-execution.at:1102' \
+#AT_STOP_1314
+#AT_START_1315
+at_fn_group_banner 1315 'ovsdb-execution.at:1102' \
   "referential integrity -- mutual references" "     " 78
 at_xfail=no
 (
-  $as_echo "1312. $at_setup_line: testing $at_desc ..."
+  $as_echo "1315. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -176733,7 +177475,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176746,7 +177488,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176767,13 +177509,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1312
-#AT_START_1313
-at_fn_group_banner 1313 'ovsdb-execution.at:1102' \
+#AT_STOP_1315
+#AT_START_1316
+at_fn_group_banner 1316 'ovsdb-execution.at:1102' \
   "weak references" "                                " 78
 at_xfail=no
 (
-  $as_echo "1313. $at_setup_line: testing $at_desc ..."
+  $as_echo "1316. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -176968,7 +177710,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -176981,7 +177723,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177010,13 +177752,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1313
-#AT_START_1314
-at_fn_group_banner 1314 'ovsdb-execution.at:1102' \
+#AT_STOP_1316
+#AT_START_1317
+at_fn_group_banner 1317 'ovsdb-execution.at:1102' \
   "immutable columns" "                              " 78
 at_xfail=no
 (
-  $as_echo "1314. $at_setup_line: testing $at_desc ..."
+  $as_echo "1317. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -177065,7 +177807,7 @@
        "table": "a",
        "where": [],
        "mutations": [["i", "*=", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177078,7 +177820,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177097,13 +177839,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1314
-#AT_START_1315
-at_fn_group_banner 1315 'ovsdb-execution.at:1102' \
+#AT_STOP_1317
+#AT_START_1318
+at_fn_group_banner 1318 'ovsdb-execution.at:1102' \
   "garbage collection" "                             " 78
 at_xfail=no
 (
-  $as_echo "1315. $at_setup_line: testing $at_desc ..."
+  $as_echo "1318. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -177306,7 +178048,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177319,7 +178061,7 @@
 $as_echo "$at_srcdir/ovsdb-execution.at:1102: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-execution.at:1102"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177349,13 +178091,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1315
-#AT_START_1316
-at_fn_group_banner 1316 'ovsdb-trigger.at:15' \
+#AT_STOP_1318
+#AT_START_1319
+at_fn_group_banner 1319 'ovsdb-trigger.at:15' \
   "trigger fires immediately" "                      " 79
 at_xfail=no
 (
-  $as_echo "1316. $at_setup_line: testing $at_desc ..."
+  $as_echo "1319. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -177399,7 +178141,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 2, "name": "two"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177412,7 +178154,7 @@
 $as_echo "$at_srcdir/ovsdb-trigger.at:15: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-trigger.at:15"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177427,13 +178169,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1316
-#AT_START_1317
-at_fn_group_banner 1317 'ovsdb-trigger.at:38' \
+#AT_STOP_1319
+#AT_START_1320
+at_fn_group_banner 1320 'ovsdb-trigger.at:38' \
   "trigger times out" "                              " 79
 at_xfail=no
 (
-  $as_echo "1317. $at_setup_line: testing $at_desc ..."
+  $as_echo "1320. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -177475,7 +178217,7 @@
                 {"name": "one", "number": 1},
                 {"name": "two", "number": 2}]}]' \
     '["advance", 10]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177488,7 +178230,7 @@
 $as_echo "$at_srcdir/ovsdb-trigger.at:38: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-trigger.at:38"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177504,13 +178246,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1317
-#AT_START_1318
-at_fn_group_banner 1318 'ovsdb-trigger.at:61' \
+#AT_STOP_1320
+#AT_START_1321
+at_fn_group_banner 1321 'ovsdb-trigger.at:61' \
   "trigger fires after delay" "                      " 79
 at_xfail=no
 (
-  $as_echo "1318. $at_setup_line: testing $at_desc ..."
+  $as_echo "1321. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -177564,7 +178306,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 2, "name": "two"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177577,7 +178319,7 @@
 $as_echo "$at_srcdir/ovsdb-trigger.at:61: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-trigger.at:61"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177595,13 +178337,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1318
-#AT_START_1319
-at_fn_group_banner 1319 'ovsdb-trigger.at:92' \
+#AT_STOP_1321
+#AT_START_1322
+at_fn_group_banner 1322 'ovsdb-trigger.at:92' \
   "delayed trigger modifies database" "              " 79
 at_xfail=no
 (
-  $as_echo "1319. $at_setup_line: testing $at_desc ..."
+  $as_echo "1322. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -177671,7 +178413,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177684,7 +178426,7 @@
 $as_echo "$at_srcdir/ovsdb-trigger.at:92: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-trigger.at:92"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177703,13 +178445,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1319
-#AT_START_1320
-at_fn_group_banner 1320 'ovsdb-trigger.at:132' \
+#AT_STOP_1322
+#AT_START_1323
+at_fn_group_banner 1323 'ovsdb-trigger.at:132' \
   "one delayed trigger wakes up another" "           " 79
 at_xfail=no
 (
-  $as_echo "1320. $at_setup_line: testing $at_desc ..."
+  $as_echo "1323. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -177807,7 +178549,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177820,7 +178562,7 @@
 $as_echo "$at_srcdir/ovsdb-trigger.at:132: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-trigger.at:132"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177841,13 +178583,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1320
-#AT_START_1321
-at_fn_group_banner 1321 'ovsdb-tool.at:30' \
+#AT_STOP_1323
+#AT_START_1324
+at_fn_group_banner 1324 'ovsdb-tool.at:30' \
   "insert default row, query table" "                " 80
 at_xfail=no
 (
-  $as_echo "1321. $at_setup_line: testing $at_desc ..."
+  $as_echo "1324. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -177858,7 +178600,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -177877,7 +178619,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -177897,7 +178639,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -177912,7 +178654,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -177928,13 +178670,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1321
-#AT_START_1322
-at_fn_group_banner 1322 'ovsdb-tool.at:30' \
+#AT_STOP_1324
+#AT_START_1325
+at_fn_group_banner 1325 'ovsdb-tool.at:30' \
   "insert row, query table" "                        " 80
 at_xfail=no
 (
-  $as_echo "1322. $at_setup_line: testing $at_desc ..."
+  $as_echo "1325. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -177945,7 +178687,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -177964,7 +178706,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -177984,7 +178726,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -177999,7 +178741,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -178015,13 +178757,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1322
-#AT_START_1323
-at_fn_group_banner 1323 'ovsdb-tool.at:30' \
+#AT_STOP_1325
+#AT_START_1326
+at_fn_group_banner 1326 'ovsdb-tool.at:30' \
   "insert rows, query by value" "                    " 80
 at_xfail=no
 (
-  $as_echo "1323. $at_setup_line: testing $at_desc ..."
+  $as_echo "1326. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -178032,7 +178774,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178051,7 +178793,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178071,7 +178813,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178091,7 +178833,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["name", "==", "zero"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178111,7 +178853,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["name", "==", "one"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178126,7 +178868,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -178144,13 +178886,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1323
-#AT_START_1324
-at_fn_group_banner 1324 'ovsdb-tool.at:30' \
+#AT_STOP_1326
+#AT_START_1327
+at_fn_group_banner 1327 'ovsdb-tool.at:30' \
   "insert rows, query by named-uuid" "               " 80
 at_xfail=no
 (
-  $as_echo "1324. $at_setup_line: testing $at_desc ..."
+  $as_echo "1327. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -178161,7 +178903,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178202,7 +178944,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["_uuid", "==", ["named-uuid", "second"]]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178217,7 +178959,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -178232,13 +178974,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1324
-#AT_START_1325
-at_fn_group_banner 1325 'ovsdb-tool.at:30' \
+#AT_STOP_1327
+#AT_START_1328
+at_fn_group_banner 1328 'ovsdb-tool.at:30' \
   "insert rows, update rows by value" "              " 80
 at_xfail=no
 (
-  $as_echo "1325. $at_setup_line: testing $at_desc ..."
+  $as_echo "1328. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -178249,7 +178991,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178270,7 +179012,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178292,7 +179034,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178314,7 +179056,7 @@
        "table": "ordinals",
        "where": [["name", "==", "zero"]],
        "row": {"name": "nought"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178336,7 +179078,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178351,7 +179093,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -178369,13 +179111,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1325
-#AT_START_1326
-at_fn_group_banner 1326 'ovsdb-tool.at:30' \
+#AT_STOP_1328
+#AT_START_1329
+at_fn_group_banner 1329 'ovsdb-tool.at:30' \
   "insert rows, mutate rows" "                       " 80
 at_xfail=no
 (
-  $as_echo "1326. $at_setup_line: testing $at_desc ..."
+  $as_echo "1329. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -178386,7 +179128,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178407,7 +179149,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178429,7 +179171,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178451,7 +179193,7 @@
        "table": "ordinals",
        "where": [["name", "==", "zero"]],
        "mutations": [["number", "+=", 2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178473,7 +179215,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178488,7 +179230,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -178506,13 +179248,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1326
-#AT_START_1327
-at_fn_group_banner 1327 'ovsdb-tool.at:30' \
+#AT_STOP_1329
+#AT_START_1330
+at_fn_group_banner 1330 'ovsdb-tool.at:30' \
   "insert rows, delete by named-uuid" "              " 80
 at_xfail=no
 (
-  $as_echo "1327. $at_setup_line: testing $at_desc ..."
+  $as_echo "1330. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -178523,7 +179265,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178566,7 +179308,7 @@
        "table": "ordinals",
        "where": [],
        "columns": ["name","number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178581,7 +179323,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -178596,13 +179338,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1327
-#AT_START_1328
-at_fn_group_banner 1328 'ovsdb-tool.at:30' \
+#AT_STOP_1330
+#AT_START_1331
+at_fn_group_banner 1331 'ovsdb-tool.at:30' \
   "insert rows, delete rows by value" "              " 80
 at_xfail=no
 (
-  $as_echo "1328. $at_setup_line: testing $at_desc ..."
+  $as_echo "1331. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -178613,7 +179355,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178634,7 +179376,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178656,7 +179398,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178676,7 +179418,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["name", "==", "zero"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178696,7 +179438,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178711,7 +179453,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -178729,13 +179471,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1328
-#AT_START_1329
-at_fn_group_banner 1329 'ovsdb-tool.at:30' \
+#AT_STOP_1331
+#AT_START_1332
+at_fn_group_banner 1332 'ovsdb-tool.at:30' \
   "insert rows, delete by (non-matching) value" "    " 80
 at_xfail=no
 (
-  $as_echo "1329. $at_setup_line: testing $at_desc ..."
+  $as_echo "1332. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -178746,7 +179488,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178767,7 +179509,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178789,7 +179531,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178809,7 +179551,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["name", "==", "nought"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178831,7 +179573,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178846,7 +179588,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -178864,13 +179606,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1329
-#AT_START_1330
-at_fn_group_banner 1330 'ovsdb-tool.at:30' \
+#AT_STOP_1332
+#AT_START_1333
+at_fn_group_banner 1333 'ovsdb-tool.at:30' \
   "insert rows, delete all" "                        " 80
 at_xfail=no
 (
-  $as_echo "1330. $at_setup_line: testing $at_desc ..."
+  $as_echo "1333. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -178881,7 +179623,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178924,7 +179666,7 @@
        "table": "ordinals",
        "where": [],
        "columns": ["name","number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -178939,7 +179681,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -178954,13 +179696,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1330
-#AT_START_1331
-at_fn_group_banner 1331 'ovsdb-tool.at:30' \
+#AT_STOP_1333
+#AT_START_1334
+at_fn_group_banner 1334 'ovsdb-tool.at:30' \
   "insert row, query table, commit" "                " 80
 at_xfail=no
 (
-  $as_echo "1331. $at_setup_line: testing $at_desc ..."
+  $as_echo "1334. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -178971,7 +179713,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179000,7 +179742,7 @@
        "where": []},
       {"op": "commit",
        "durable": false}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179015,7 +179757,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -179030,13 +179772,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1331
-#AT_START_1332
-at_fn_group_banner 1332 'ovsdb-tool.at:30' \
+#AT_STOP_1334
+#AT_START_1335
+at_fn_group_banner 1335 'ovsdb-tool.at:30' \
   "insert row, query table, commit durably" "        " 80
 at_xfail=no
 (
-  $as_echo "1332. $at_setup_line: testing $at_desc ..."
+  $as_echo "1335. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -179047,7 +179789,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179076,7 +179818,7 @@
        "where": []},
       {"op": "commit",
        "durable": true}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179091,7 +179833,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -179106,13 +179848,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1332
-#AT_START_1333
-at_fn_group_banner 1333 'ovsdb-tool.at:30' \
+#AT_STOP_1335
+#AT_START_1336
+at_fn_group_banner 1336 'ovsdb-tool.at:30' \
   "equality wait with correct rows" "                " 80
 at_xfail=no
 (
-  $as_echo "1333. $at_setup_line: testing $at_desc ..."
+  $as_echo "1336. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -179123,7 +179865,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179164,7 +179906,7 @@
        "until": "==",
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179179,7 +179921,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -179194,13 +179936,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1333
-#AT_START_1334
-at_fn_group_banner 1334 'ovsdb-tool.at:30' \
+#AT_STOP_1336
+#AT_START_1337
+at_fn_group_banner 1337 'ovsdb-tool.at:30' \
   "equality wait with extra row" "                   " 80
 at_xfail=no
 (
-  $as_echo "1334. $at_setup_line: testing $at_desc ..."
+  $as_echo "1337. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -179211,7 +179953,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179254,7 +179996,7 @@
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1},
                 {"name": "two", "number": 2}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179269,7 +180011,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -179284,13 +180026,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1334
-#AT_START_1335
-at_fn_group_banner 1335 'ovsdb-tool.at:30' \
+#AT_STOP_1337
+#AT_START_1338
+at_fn_group_banner 1338 'ovsdb-tool.at:30' \
   "equality wait with missing row" "                 " 80
 at_xfail=no
 (
-  $as_echo "1335. $at_setup_line: testing $at_desc ..."
+  $as_echo "1338. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -179301,7 +180043,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179340,7 +180082,7 @@
        "columns": ["name", "number"],
        "until": "==",
        "rows": [{"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179355,7 +180097,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -179370,13 +180112,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1335
-#AT_START_1336
-at_fn_group_banner 1336 'ovsdb-tool.at:30' \
+#AT_STOP_1338
+#AT_START_1339
+at_fn_group_banner 1339 'ovsdb-tool.at:30' \
   "inequality wait with correct rows" "              " 80
 at_xfail=no
 (
-  $as_echo "1336. $at_setup_line: testing $at_desc ..."
+  $as_echo "1339. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -179387,7 +180129,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179428,7 +180170,7 @@
        "until": "!=",
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179443,7 +180185,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -179458,13 +180200,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1336
-#AT_START_1337
-at_fn_group_banner 1337 'ovsdb-tool.at:30' \
+#AT_STOP_1339
+#AT_START_1340
+at_fn_group_banner 1340 'ovsdb-tool.at:30' \
   "inequality wait with extra row" "                 " 80
 at_xfail=no
 (
-  $as_echo "1337. $at_setup_line: testing $at_desc ..."
+  $as_echo "1340. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -179475,7 +180217,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179518,7 +180260,7 @@
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1},
                 {"name": "two", "number": 2}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179533,7 +180275,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -179548,13 +180290,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1337
-#AT_START_1338
-at_fn_group_banner 1338 'ovsdb-tool.at:30' \
+#AT_STOP_1340
+#AT_START_1341
+at_fn_group_banner 1341 'ovsdb-tool.at:30' \
   "inequality wait with missing row" "               " 80
 at_xfail=no
 (
-  $as_echo "1338. $at_setup_line: testing $at_desc ..."
+  $as_echo "1341. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -179565,7 +180307,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179604,7 +180346,7 @@
        "columns": ["name", "number"],
        "until": "!=",
        "rows": [{"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179619,7 +180361,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -179634,13 +180376,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1338
-#AT_START_1339
-at_fn_group_banner 1339 'ovsdb-tool.at:30' \
+#AT_STOP_1341
+#AT_START_1342
+at_fn_group_banner 1342 'ovsdb-tool.at:30' \
   "insert and update constraints" "                  " 80
 at_xfail=no
 (
-  $as_echo "1339. $at_setup_line: testing $at_desc ..."
+  $as_echo "1342. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -179651,7 +180393,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179670,7 +180412,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179690,7 +180432,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": -1}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179712,7 +180454,7 @@
        "table": "constrained",
        "where": [],
        "row": {"positive": -2}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179732,7 +180474,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": 1}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179752,7 +180494,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": 2}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179767,7 +180509,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -179786,13 +180528,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1339
-#AT_START_1340
-at_fn_group_banner 1340 'ovsdb-tool.at:30' \
+#AT_STOP_1342
+#AT_START_1343
+at_fn_group_banner 1343 'ovsdb-tool.at:30' \
   "index uniqueness checking" "                      " 80
 at_xfail=no
 (
-  $as_echo "1340. $at_setup_line: testing $at_desc ..."
+  $as_echo "1343. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -179803,7 +180545,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179822,7 +180564,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179842,7 +180584,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "another one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179868,7 +180610,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["name", "==", "one"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179900,7 +180642,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "still another one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179920,7 +180662,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 2, "name": "two"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179942,7 +180684,7 @@
        "table": "ordinals",
        "where": [],
        "row": {"number": 3}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -179972,7 +180714,7 @@
        "table": "ordinals",
        "where": [["name", "==", "two"]],
        "row": {"number": 1, "name": "old one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180016,7 +180758,7 @@
        "where": [],
        "columns": ["number", "name"],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180031,7 +180773,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -180052,14 +180794,14 @@
      set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_1340
-#AT_START_1341
-at_fn_group_banner 1341 'ovsdb-tool.at:30' \
+read at_status <"$at_status_file"
+#AT_STOP_1343
+#AT_START_1344
+at_fn_group_banner 1344 'ovsdb-tool.at:30' \
   "referential integrity -- simple" "                " 80
 at_xfail=no
 (
-  $as_echo "1341. $at_setup_line: testing $at_desc ..."
+  $as_echo "1344. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -180070,7 +180812,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180115,7 +180857,7 @@
        "table": "a",
        "row": {"a": 2,
                "a2b": ["set", [["named-uuid", "brow"]]]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180135,7 +180877,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180157,7 +180899,7 @@
        "table": "b",
        "where": [],
        "mutations": [["x", "delete", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180177,7 +180919,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180197,7 +180939,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180217,7 +180959,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180237,7 +180979,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180257,7 +180999,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180277,7 +181019,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180292,7 +181034,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -180315,13 +181057,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1341
-#AT_START_1342
-at_fn_group_banner 1342 'ovsdb-tool.at:30' \
+#AT_STOP_1344
+#AT_START_1345
+at_fn_group_banner 1345 'ovsdb-tool.at:30' \
   "referential integrity -- mutual references" "     " 80
 at_xfail=no
 (
-  $as_echo "1342. $at_setup_line: testing $at_desc ..."
+  $as_echo "1345. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -180332,7 +181074,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180369,7 +181111,7 @@
                "b2b": ["set", [["named-uuid", "row2"]]],
                "b2a": ["set", [["named-uuid", "row1"]]]},
        "uuid-name": "row2"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180389,7 +181131,7 @@
       {"op": "insert",
        "table": "a",
        "row": {"a2b": ["set", [["uuid", "b516b960-5b19-4fc2-bb82-fe1cbd6d0241"]]]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180409,7 +181151,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180429,7 +181171,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180449,7 +181191,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180469,7 +181211,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180495,7 +181237,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180510,7 +181252,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -180531,13 +181273,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1342
-#AT_START_1343
-at_fn_group_banner 1343 'ovsdb-tool.at:30' \
+#AT_STOP_1345
+#AT_START_1346
+at_fn_group_banner 1346 'ovsdb-tool.at:30' \
   "weak references" "                                " 80
 at_xfail=no
 (
-  $as_echo "1343. $at_setup_line: testing $at_desc ..."
+  $as_echo "1346. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -180548,7 +181290,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180629,7 +181371,7 @@
        "row": {"b": 3,
                "b2a": ["named-uuid", "row2"]},
        "uuid-name": "row4"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180653,7 +181395,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180677,7 +181419,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180699,7 +181441,7 @@
        "table": "a",
        "row": {"a2a1": ["named-uuid", "me"]},
        "uuid-name": "me"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180719,7 +181461,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 3]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180739,7 +181481,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180759,7 +181501,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180783,7 +181525,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180807,7 +181549,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180827,7 +181569,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180851,7 +181593,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180875,7 +181617,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180895,7 +181637,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180919,7 +181661,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180943,7 +181685,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -180958,7 +181700,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -180987,13 +181729,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1343
-#AT_START_1344
-at_fn_group_banner 1344 'ovsdb-tool.at:30' \
+#AT_STOP_1346
+#AT_START_1347
+at_fn_group_banner 1347 'ovsdb-tool.at:30' \
   "immutable columns" "                              " 80
 at_xfail=no
 (
-  $as_echo "1344. $at_setup_line: testing $at_desc ..."
+  $as_echo "1347. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -181004,7 +181746,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181025,7 +181767,7 @@
        "table": "a",
        "row": {"i": 5},
        "uuid-name": "row1"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181047,7 +181789,7 @@
        "table": "a",
        "row": {"i": 10},
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181069,7 +181811,7 @@
        "table": "a",
        "row": {"i": 5},
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181091,7 +181833,7 @@
        "table": "a",
        "where": [],
        "mutations": [["i", "-=", 5]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181113,7 +181855,7 @@
        "table": "a",
        "where": [],
        "mutations": [["i", "*=", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181128,7 +181870,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181147,13 +181889,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1344
-#AT_START_1345
-at_fn_group_banner 1345 'ovsdb-tool.at:30' \
+#AT_STOP_1347
+#AT_START_1348
+at_fn_group_banner 1348 'ovsdb-tool.at:30' \
   "garbage collection" "                             " 80
 at_xfail=no
 (
-  $as_echo "1345. $at_setup_line: testing $at_desc ..."
+  $as_echo "1348. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -181164,7 +181906,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:30"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181183,7 +181925,7 @@
       {"op": "insert",
        "table": "a",
        "row": {"a": 0}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181205,7 +181947,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181251,7 +181993,7 @@
        "table": "a",
        "row": {"a": 3},
        "uuid-name": "row3"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181273,7 +182015,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181303,7 +182045,7 @@
        "table": "a",
        "row": {"a": 5, "a2a": ["named-uuid", "row4"]},
        "uuid-name": "row5"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181327,7 +182069,7 @@
        "where": [],
        "columns": ["a"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181349,7 +182091,7 @@
        "table": "a",
        "where": [["a", "==", 4]],
        "row": {"a2a": ["set", []]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181371,7 +182113,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181401,7 +182143,7 @@
        "table": "a",
        "row": {"a": 7, "wa2a": ["named-uuid", "row6"]},
        "uuid-name": "row7"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181423,7 +182165,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181469,7 +182211,7 @@
        "table": "a",
        "row": {"a": 11, "a2a": ["named-uuid", "row8"]},
        "uuid-name": "row11"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181493,7 +182235,7 @@
        "where": [],
        "columns": ["a"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181515,7 +182257,7 @@
        "table": "a",
        "where": [["a", "==", 9]],
        "row": {"a2a": ["set", []]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181537,7 +182279,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181559,7 +182301,7 @@
        "table": "a",
        "row": {"a": 12, "a2a": ["named-uuid", "self"]},
        "uuid-name": "self"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181581,7 +182323,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181596,7 +182338,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:30: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:30"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181626,13 +182368,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1345
-#AT_START_1346
-at_fn_group_banner 1346 'ovsdb-tool.at:32' \
+#AT_STOP_1348
+#AT_START_1349
+at_fn_group_banner 1349 'ovsdb-tool.at:32' \
   "transaction comments" "                           " 80
 at_xfail=no
 (
-  $as_echo "1346. $at_setup_line: testing $at_desc ..."
+  $as_echo "1349. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -181642,7 +182384,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:36: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:36"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181667,7 +182409,7 @@
       "row": {"name": "five", "number": 5}},
      {"op": "comment",
       "comment": "add row for 5"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181680,7 +182422,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:44: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:44"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181695,7 +182437,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:47: grep \"add row for 5\" db"
 at_fn_check_prepare_trace "ovsdb-tool.at:47"
 ( $at_check_trace; grep "add row for 5" db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181708,13 +182450,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1346
-#AT_START_1347
-at_fn_group_banner 1347 'ovsdb-tool.at:50' \
+#AT_STOP_1349
+#AT_START_1350
+at_fn_group_banner 1350 'ovsdb-tool.at:50' \
   "ovsdb-tool compact" "                             " 80
 at_xfail=no
 (
-  $as_echo "1347. $at_setup_line: testing $at_desc ..."
+  $as_echo "1350. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -181730,7 +182472,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:62: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:62"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181743,7 +182485,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:63: test ! -e .db.~lock"
 at_fn_check_prepare_trace "ovsdb-tool.at:63"
 ( $at_check_trace; test ! -e .db.~lock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181756,7 +182498,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:64: test -h db"
 at_fn_check_prepare_trace "ovsdb-tool.at:64"
 ( $at_check_trace; test -h db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181769,7 +182511,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:65: test -f dir/db"
 at_fn_check_prepare_trace "ovsdb-tool.at:65"
 ( $at_check_trace; test -f dir/db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181828,7 +182570,7 @@
          {"op": "comment",
           "comment": "add back row for '"$pair"'"}]'
     done
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181841,7 +182583,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:94: \${PERL} \$srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/\"_date\":[0-9]*/\"_date\":0/' | ovstest test-json --multiple -"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:94"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/"_date":0/' | ovstest test-json --multiple -
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181874,7 +182616,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:116: ovsdb-server --unixctl=\"\`pwd\`\"/unixctl --remote=punix:socket --run \"ovsdb-client dump unix:socket ordinals\" db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-tool.at:116"
 ( $at_check_trace; ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181887,7 +182629,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:118: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:118"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181911,7 +182653,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:131: ovsdb-tool compact db"
 at_fn_check_prepare_trace "ovsdb-tool.at:131"
 ( $at_check_trace; ovsdb-tool compact db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181924,7 +182666,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:134: test ! -e .db.~lock"
 at_fn_check_prepare_trace "ovsdb-tool.at:134"
 ( $at_check_trace; test ! -e .db.~lock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181937,7 +182679,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:135: test -h db"
 at_fn_check_prepare_trace "ovsdb-tool.at:135"
 ( $at_check_trace; test -h db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181950,7 +182692,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:136: test -f dir/db"
 at_fn_check_prepare_trace "ovsdb-tool.at:136"
 ( $at_check_trace; test -f dir/db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181964,7 +182706,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:141: test \`wc -l < db\` -eq 4"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-tool.at:141"
 ( $at_check_trace; test `wc -l < db` -eq 4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -181978,7 +182720,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:143: ovsdb-server --unixctl=\"\`pwd\`\"/unixctl --remote=punix:socket --run \"ovsdb-client dump unix:socket ordinals\" db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-tool.at:143"
 ( $at_check_trace; ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -181992,7 +182734,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:145: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:145"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182016,13 +182758,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1347
-#AT_START_1348
-at_fn_group_banner 1348 'ovsdb-tool.at:158' \
+#AT_STOP_1350
+#AT_START_1351
+at_fn_group_banner 1351 'ovsdb-tool.at:158' \
   "ovsdb-tool convert -- removing a column" "        " 80
 at_xfail=no
 (
-  $as_echo "1348. $at_setup_line: testing $at_desc ..."
+  $as_echo "1351. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -182041,7 +182783,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:170: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:170"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182072,7 +182814,7 @@
          {"op": "comment",
           "comment": "add row for '"$pair"'"}]'
     done
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182085,7 +182827,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:185: ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db"
 at_fn_check_prepare_trace "ovsdb-tool.at:185"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182098,7 +182840,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:187: ovsdb-client dump unix:socket ordinals"
 at_fn_check_prepare_trace "ovsdb-tool.at:187"
 ( $at_check_trace; ovsdb-client dump unix:socket ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182111,7 +182853,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:188: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:188"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182139,7 +182881,7 @@
 ( $at_check_trace; ovs_wait_cond () { if test -e ovsdb-server.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182153,7 +182895,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:202: ovsdb-tool convert db new-schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:202"
 ( $at_check_trace; ovsdb-tool convert db new-schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182167,7 +182909,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:207: test \`wc -l < db\` -eq 4"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-tool.at:207"
 ( $at_check_trace; test `wc -l < db` -eq 4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182181,7 +182923,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:209: ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db"
 at_fn_check_prepare_trace "ovsdb-tool.at:209"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182195,7 +182937,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:211: ovsdb-client dump unix:socket ordinals"
 at_fn_check_prepare_trace "ovsdb-tool.at:211"
 ( $at_check_trace; ovsdb-client dump unix:socket ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182209,7 +182951,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:212: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:212"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182238,7 +182980,7 @@
 ( $at_check_trace; ovs_wait_cond () { if test -e ovsdb-server.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182252,13 +182994,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1348
-#AT_START_1349
-at_fn_group_banner 1349 'ovsdb-tool.at:226' \
+#AT_STOP_1351
+#AT_START_1352
+at_fn_group_banner 1352 'ovsdb-tool.at:226' \
   "ovsdb-tool convert -- adding a column" "          " 80
 at_xfail=no
 (
-  $as_echo "1349. $at_setup_line: testing $at_desc ..."
+  $as_echo "1352. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -182277,7 +183019,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:238: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:238"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182306,7 +183048,7 @@
          {"op": "comment",
           "comment": "add row for '"$number"'"}]'
     done
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182319,7 +183061,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:252: ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db"
 at_fn_check_prepare_trace "ovsdb-tool.at:252"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182332,7 +183074,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:254: ovsdb-client dump unix:socket ordinals"
 at_fn_check_prepare_trace "ovsdb-tool.at:254"
 ( $at_check_trace; ovsdb-client dump unix:socket ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182345,7 +183087,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:255: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:255"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182373,7 +183115,7 @@
 ( $at_check_trace; ovs_wait_cond () { if test -e ovsdb-server.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182387,7 +183129,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:269: ovsdb-tool convert db new-schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:269"
 ( $at_check_trace; ovsdb-tool convert db new-schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182401,7 +183143,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:274: test \`wc -l < db\` -eq 4"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-tool.at:274"
 ( $at_check_trace; test `wc -l < db` -eq 4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182415,7 +183157,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:276: ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db"
 at_fn_check_prepare_trace "ovsdb-tool.at:276"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182429,7 +183171,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:278: ovsdb-client dump unix:socket ordinals"
 at_fn_check_prepare_trace "ovsdb-tool.at:278"
 ( $at_check_trace; ovsdb-client dump unix:socket ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182443,7 +183185,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:279: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-tool.at:279"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182472,7 +183214,7 @@
 ( $at_check_trace; ovs_wait_cond () { if test -e ovsdb-server.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182486,13 +183228,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1349
-#AT_START_1350
-at_fn_group_banner 1350 'ovsdb-tool.at:293' \
+#AT_STOP_1352
+#AT_START_1353
+at_fn_group_banner 1353 'ovsdb-tool.at:293' \
   "ovsdb-tool schema-version" "                      " 80
 at_xfail=no
 (
-  $as_echo "1350. $at_setup_line: testing $at_desc ..."
+  $as_echo "1353. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -182501,7 +183243,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:296: ovsdb-tool schema-version schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:296"
 ( $at_check_trace; ovsdb-tool schema-version schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182516,13 +183258,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1350
-#AT_START_1351
-at_fn_group_banner 1351 'ovsdb-tool.at:300' \
+#AT_STOP_1353
+#AT_START_1354
+at_fn_group_banner 1354 'ovsdb-tool.at:300' \
   "ovsdb-tool db-version" "                          " 80
 at_xfail=no
 (
-  $as_echo "1351. $at_setup_line: testing $at_desc ..."
+  $as_echo "1354. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -182532,7 +183274,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:304: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:304"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182545,7 +183287,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:305: ovsdb-tool db-version db"
 at_fn_check_prepare_trace "ovsdb-tool.at:305"
 ( $at_check_trace; ovsdb-tool db-version db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182560,13 +183302,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1351
-#AT_START_1352
-at_fn_group_banner 1352 'ovsdb-tool.at:309' \
+#AT_STOP_1354
+#AT_START_1355
+at_fn_group_banner 1355 'ovsdb-tool.at:309' \
   "ovsdb-tool schema-cksum" "                        " 80
 at_xfail=no
 (
-  $as_echo "1352. $at_setup_line: testing $at_desc ..."
+  $as_echo "1355. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -182575,7 +183317,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:312: ovsdb-tool schema-cksum schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:312"
 ( $at_check_trace; ovsdb-tool schema-cksum schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182590,13 +183332,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1352
-#AT_START_1353
-at_fn_group_banner 1353 'ovsdb-tool.at:316' \
+#AT_STOP_1355
+#AT_START_1356
+at_fn_group_banner 1356 'ovsdb-tool.at:316' \
   "ovsdb-tool db-cksum" "                            " 80
 at_xfail=no
 (
-  $as_echo "1353. $at_setup_line: testing $at_desc ..."
+  $as_echo "1356. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -182606,7 +183348,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:320: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:320"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182619,7 +183361,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:321: ovsdb-tool db-cksum db"
 at_fn_check_prepare_trace "ovsdb-tool.at:321"
 ( $at_check_trace; ovsdb-tool db-cksum db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182634,13 +183376,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1353
-#AT_START_1354
-at_fn_group_banner 1354 'ovsdb-tool.at:325' \
+#AT_STOP_1356
+#AT_START_1357
+at_fn_group_banner 1357 'ovsdb-tool.at:325' \
   "ovsdb-tool needs-conversion (no conversion needed)" "" 80
 at_xfail=no
 (
-  $as_echo "1354. $at_setup_line: testing $at_desc ..."
+  $as_echo "1357. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -182650,7 +183392,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:329: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:329"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182663,7 +183405,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:330: ovsdb-tool needs-conversion db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:330"
 ( $at_check_trace; ovsdb-tool needs-conversion db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182678,13 +183420,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1354
-#AT_START_1355
-at_fn_group_banner 1355 'ovsdb-tool.at:334' \
+#AT_STOP_1357
+#AT_START_1358
+at_fn_group_banner 1358 'ovsdb-tool.at:334' \
   "ovsdb-tool needs-conversion (conversion needed)" "" 80
 at_xfail=no
 (
-  $as_echo "1355. $at_setup_line: testing $at_desc ..."
+  $as_echo "1358. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -182694,7 +183436,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:338: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-tool.at:338"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182708,7 +183450,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:340: diff schema schema2"
 at_fn_check_prepare_trace "ovsdb-tool.at:340"
 ( $at_check_trace; diff schema schema2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182721,7 +183463,7 @@
 $as_echo "$at_srcdir/ovsdb-tool.at:341: ovsdb-tool needs-conversion db schema2"
 at_fn_check_prepare_trace "ovsdb-tool.at:341"
 ( $at_check_trace; ovsdb-tool needs-conversion db schema2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -182736,13 +183478,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1355
-#AT_START_1356
-at_fn_group_banner 1356 'ovsdb-server.at:39' \
+#AT_STOP_1358
+#AT_START_1359
+at_fn_group_banner 1359 'ovsdb-server.at:39' \
   "insert default row, query table" "                " 81
 at_xfail=no
 (
-  $as_echo "1356. $at_setup_line: testing $at_desc ..."
+  $as_echo "1359. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -182752,7 +183494,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182765,7 +183507,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182784,7 +183526,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182807,7 +183549,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182825,7 +183567,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182845,7 +183587,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182862,7 +183604,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182878,13 +183620,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1356
-#AT_START_1357
-at_fn_group_banner 1357 'ovsdb-server.at:39' \
+#AT_STOP_1359
+#AT_START_1360
+at_fn_group_banner 1360 'ovsdb-server.at:39' \
   "insert row, query table" "                        " 81
 at_xfail=no
 (
-  $as_echo "1357. $at_setup_line: testing $at_desc ..."
+  $as_echo "1360. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -182894,7 +183636,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182907,7 +183649,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182926,7 +183668,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182949,7 +183691,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182967,7 +183709,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -182987,7 +183729,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183004,7 +183746,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183020,13 +183762,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1357
-#AT_START_1358
-at_fn_group_banner 1358 'ovsdb-server.at:39' \
+#AT_STOP_1360
+#AT_START_1361
+at_fn_group_banner 1361 'ovsdb-server.at:39' \
   "insert rows, query by value" "                    " 81
 at_xfail=no
 (
-  $as_echo "1358. $at_setup_line: testing $at_desc ..."
+  $as_echo "1361. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -183036,7 +183778,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183049,7 +183791,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183068,7 +183810,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183091,7 +183833,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183114,7 +183856,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["name", "==", "zero"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183137,7 +183879,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["name", "==", "one"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183155,7 +183897,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183177,7 +183919,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183194,7 +183936,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183210,13 +183952,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1358
-#AT_START_1359
-at_fn_group_banner 1359 'ovsdb-server.at:39' \
+#AT_STOP_1361
+#AT_START_1362
+at_fn_group_banner 1362 'ovsdb-server.at:39' \
   "insert rows, query by named-uuid" "               " 81
 at_xfail=no
 (
-  $as_echo "1359. $at_setup_line: testing $at_desc ..."
+  $as_echo "1362. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -183226,7 +183968,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183239,7 +183981,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183280,7 +184022,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["_uuid", "==", ["named-uuid", "second"]]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183298,7 +184040,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183317,7 +184059,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183334,7 +184076,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183350,13 +184092,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1359
-#AT_START_1360
-at_fn_group_banner 1360 'ovsdb-server.at:39' \
+#AT_STOP_1362
+#AT_START_1363
+at_fn_group_banner 1363 'ovsdb-server.at:39' \
   "insert rows, update rows by value" "              " 81
 at_xfail=no
 (
-  $as_echo "1360. $at_setup_line: testing $at_desc ..."
+  $as_echo "1363. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -183366,7 +184108,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183379,7 +184121,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183400,7 +184142,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183425,7 +184167,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183450,7 +184192,7 @@
        "table": "ordinals",
        "where": [["name", "==", "zero"]],
        "row": {"name": "nought"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183475,7 +184217,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183493,7 +184235,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183515,7 +184257,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183532,7 +184274,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183548,13 +184290,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1360
-#AT_START_1361
-at_fn_group_banner 1361 'ovsdb-server.at:39' \
+#AT_STOP_1363
+#AT_START_1364
+at_fn_group_banner 1364 'ovsdb-server.at:39' \
   "insert rows, mutate rows" "                       " 81
 at_xfail=no
 (
-  $as_echo "1361. $at_setup_line: testing $at_desc ..."
+  $as_echo "1364. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -183564,7 +184306,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183577,7 +184319,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183598,7 +184340,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183623,7 +184365,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183648,7 +184390,7 @@
        "table": "ordinals",
        "where": [["name", "==", "zero"]],
        "mutations": [["number", "+=", 2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183673,7 +184415,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183691,7 +184433,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183713,7 +184455,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183730,7 +184472,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183746,13 +184488,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1361
-#AT_START_1362
-at_fn_group_banner 1362 'ovsdb-server.at:39' \
+#AT_STOP_1364
+#AT_START_1365
+at_fn_group_banner 1365 'ovsdb-server.at:39' \
   "insert rows, delete by named-uuid" "              " 81
 at_xfail=no
 (
-  $as_echo "1362. $at_setup_line: testing $at_desc ..."
+  $as_echo "1365. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -183762,7 +184504,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183775,7 +184517,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183818,7 +184560,7 @@
        "table": "ordinals",
        "where": [],
        "columns": ["name","number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183836,7 +184578,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183855,7 +184597,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183872,7 +184614,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183888,13 +184630,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1362
-#AT_START_1363
-at_fn_group_banner 1363 'ovsdb-server.at:39' \
+#AT_STOP_1365
+#AT_START_1366
+at_fn_group_banner 1366 'ovsdb-server.at:39' \
   "insert rows, delete rows by value" "              " 81
 at_xfail=no
 (
-  $as_echo "1363. $at_setup_line: testing $at_desc ..."
+  $as_echo "1366. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -183904,7 +184646,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183917,7 +184659,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183938,7 +184680,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183963,7 +184705,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -183986,7 +184728,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["name", "==", "zero"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184009,7 +184751,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184027,7 +184769,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184049,7 +184791,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184066,7 +184808,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184082,13 +184824,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1363
-#AT_START_1364
-at_fn_group_banner 1364 'ovsdb-server.at:39' \
+#AT_STOP_1366
+#AT_START_1367
+at_fn_group_banner 1367 'ovsdb-server.at:39' \
   "insert rows, delete by (non-matching) value" "    " 81
 at_xfail=no
 (
-  $as_echo "1364. $at_setup_line: testing $at_desc ..."
+  $as_echo "1367. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -184098,7 +184840,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184111,7 +184853,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184132,7 +184874,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184157,7 +184899,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184180,7 +184922,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["name", "==", "nought"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184205,7 +184947,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184223,7 +184965,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184245,7 +184987,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184262,7 +185004,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184278,13 +185020,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1364
-#AT_START_1365
-at_fn_group_banner 1365 'ovsdb-server.at:39' \
+#AT_STOP_1367
+#AT_START_1368
+at_fn_group_banner 1368 'ovsdb-server.at:39' \
   "insert rows, delete all" "                        " 81
 at_xfail=no
 (
-  $as_echo "1365. $at_setup_line: testing $at_desc ..."
+  $as_echo "1368. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -184294,7 +185036,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184307,7 +185049,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184350,7 +185092,7 @@
        "table": "ordinals",
        "where": [],
        "columns": ["name","number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184368,7 +185110,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184387,7 +185129,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184404,7 +185146,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184420,13 +185162,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1365
-#AT_START_1366
-at_fn_group_banner 1366 'ovsdb-server.at:39' \
+#AT_STOP_1368
+#AT_START_1369
+at_fn_group_banner 1369 'ovsdb-server.at:39' \
   "insert row, query table, commit" "                " 81
 at_xfail=no
 (
-  $as_echo "1366. $at_setup_line: testing $at_desc ..."
+  $as_echo "1369. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -184436,7 +185178,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184449,7 +185191,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184478,7 +185220,7 @@
        "where": []},
       {"op": "commit",
        "durable": false}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184496,7 +185238,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184515,7 +185257,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184532,7 +185274,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184548,13 +185290,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1366
-#AT_START_1367
-at_fn_group_banner 1367 'ovsdb-server.at:39' \
+#AT_STOP_1369
+#AT_START_1370
+at_fn_group_banner 1370 'ovsdb-server.at:39' \
   "insert row, query table, commit durably" "        " 81
 at_xfail=no
 (
-  $as_echo "1367. $at_setup_line: testing $at_desc ..."
+  $as_echo "1370. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -184564,7 +185306,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184577,7 +185319,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184606,7 +185348,7 @@
        "where": []},
       {"op": "commit",
        "durable": true}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184624,7 +185366,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184643,7 +185385,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184660,7 +185402,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184676,13 +185418,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1367
-#AT_START_1368
-at_fn_group_banner 1368 'ovsdb-server.at:39' \
+#AT_STOP_1370
+#AT_START_1371
+at_fn_group_banner 1371 'ovsdb-server.at:39' \
   "equality wait with correct rows" "                " 81
 at_xfail=no
 (
-  $as_echo "1368. $at_setup_line: testing $at_desc ..."
+  $as_echo "1371. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -184692,7 +185434,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184705,7 +185447,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184746,7 +185488,7 @@
        "until": "==",
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184764,7 +185506,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184783,7 +185525,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184800,7 +185542,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184816,13 +185558,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1368
-#AT_START_1369
-at_fn_group_banner 1369 'ovsdb-server.at:39' \
+#AT_STOP_1371
+#AT_START_1372
+at_fn_group_banner 1372 'ovsdb-server.at:39' \
   "equality wait with extra row" "                   " 81
 at_xfail=no
 (
-  $as_echo "1369. $at_setup_line: testing $at_desc ..."
+  $as_echo "1372. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -184832,7 +185574,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184845,7 +185587,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184888,7 +185630,7 @@
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1},
                 {"name": "two", "number": 2}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184906,7 +185648,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184925,7 +185667,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184942,7 +185684,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184958,13 +185700,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1369
-#AT_START_1370
-at_fn_group_banner 1370 'ovsdb-server.at:39' \
+#AT_STOP_1372
+#AT_START_1373
+at_fn_group_banner 1373 'ovsdb-server.at:39' \
   "equality wait with missing row" "                 " 81
 at_xfail=no
 (
-  $as_echo "1370. $at_setup_line: testing $at_desc ..."
+  $as_echo "1373. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -184974,7 +185716,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -184987,7 +185729,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185026,7 +185768,7 @@
        "columns": ["name", "number"],
        "until": "==",
        "rows": [{"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185044,7 +185786,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185063,7 +185805,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185080,7 +185822,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185096,13 +185838,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1370
-#AT_START_1371
-at_fn_group_banner 1371 'ovsdb-server.at:39' \
+#AT_STOP_1373
+#AT_START_1374
+at_fn_group_banner 1374 'ovsdb-server.at:39' \
   "inequality wait with correct rows" "              " 81
 at_xfail=no
 (
-  $as_echo "1371. $at_setup_line: testing $at_desc ..."
+  $as_echo "1374. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -185112,7 +185854,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185125,7 +185867,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185166,7 +185908,7 @@
        "until": "!=",
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185184,7 +185926,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185203,7 +185945,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185220,7 +185962,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185236,13 +185978,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1371
-#AT_START_1372
-at_fn_group_banner 1372 'ovsdb-server.at:39' \
+#AT_STOP_1374
+#AT_START_1375
+at_fn_group_banner 1375 'ovsdb-server.at:39' \
   "inequality wait with extra row" "                 " 81
 at_xfail=no
 (
-  $as_echo "1372. $at_setup_line: testing $at_desc ..."
+  $as_echo "1375. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -185252,7 +185994,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185265,7 +186007,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185308,7 +186050,7 @@
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1},
                 {"name": "two", "number": 2}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185326,7 +186068,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185345,7 +186087,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185362,7 +186104,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185378,13 +186120,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1372
-#AT_START_1373
-at_fn_group_banner 1373 'ovsdb-server.at:39' \
+#AT_STOP_1375
+#AT_START_1376
+at_fn_group_banner 1376 'ovsdb-server.at:39' \
   "inequality wait with missing row" "               " 81
 at_xfail=no
 (
-  $as_echo "1373. $at_setup_line: testing $at_desc ..."
+  $as_echo "1376. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -185394,7 +186136,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185407,7 +186149,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185446,7 +186188,7 @@
        "columns": ["name", "number"],
        "until": "!=",
        "rows": [{"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185464,7 +186206,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185483,7 +186225,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185500,7 +186242,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185516,13 +186258,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1373
-#AT_START_1374
-at_fn_group_banner 1374 'ovsdb-server.at:39' \
+#AT_STOP_1376
+#AT_START_1377
+at_fn_group_banner 1377 'ovsdb-server.at:39' \
   "insert and update constraints" "                  " 81
 at_xfail=no
 (
-  $as_echo "1374. $at_setup_line: testing $at_desc ..."
+  $as_echo "1377. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -185532,7 +186274,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185545,7 +186287,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185564,7 +186306,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185587,7 +186329,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": -1}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185612,7 +186354,7 @@
        "table": "constrained",
        "where": [],
        "row": {"positive": -2}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185635,7 +186377,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": 1}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185658,7 +186400,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": 2}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185676,7 +186418,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185699,7 +186441,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185716,7 +186458,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185732,13 +186474,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1374
-#AT_START_1375
-at_fn_group_banner 1375 'ovsdb-server.at:39' \
+#AT_STOP_1377
+#AT_START_1378
+at_fn_group_banner 1378 'ovsdb-server.at:39' \
   "index uniqueness checking" "                      " 81
 at_xfail=no
 (
-  $as_echo "1375. $at_setup_line: testing $at_desc ..."
+  $as_echo "1378. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -185748,7 +186490,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185761,7 +186503,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185780,7 +186522,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185803,7 +186545,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "another one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185832,7 +186574,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["name", "==", "one"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185867,7 +186609,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "still another one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185890,7 +186632,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 2, "name": "two"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185915,7 +186657,7 @@
        "table": "ordinals",
        "where": [],
        "row": {"number": 3}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185948,7 +186690,7 @@
        "table": "ordinals",
        "where": [["name", "==", "two"]],
        "row": {"number": 1, "name": "old one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -185995,7 +186737,7 @@
        "where": [],
        "columns": ["number", "name"],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186013,7 +186755,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186039,7 +186781,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186056,7 +186798,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186072,13 +186814,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1375
-#AT_START_1376
-at_fn_group_banner 1376 'ovsdb-server.at:39' \
+#AT_STOP_1378
+#AT_START_1379
+at_fn_group_banner 1379 'ovsdb-server.at:39' \
   "referential integrity -- simple" "                " 81
 at_xfail=no
 (
-  $as_echo "1376. $at_setup_line: testing $at_desc ..."
+  $as_echo "1379. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -186088,7 +186830,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186101,7 +186843,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186146,7 +186888,7 @@
        "table": "a",
        "row": {"a": 2,
                "a2b": ["set", [["named-uuid", "brow"]]]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186169,7 +186911,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186194,7 +186936,7 @@
        "table": "b",
        "where": [],
        "mutations": [["x", "delete", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186217,7 +186959,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186240,7 +186982,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186263,7 +187005,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186286,7 +187028,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186309,7 +187051,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186332,7 +187074,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186350,7 +187092,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186377,7 +187119,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186394,7 +187136,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186410,13 +187152,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1376
-#AT_START_1377
-at_fn_group_banner 1377 'ovsdb-server.at:39' \
+#AT_STOP_1379
+#AT_START_1380
+at_fn_group_banner 1380 'ovsdb-server.at:39' \
   "referential integrity -- mutual references" "     " 81
 at_xfail=no
 (
-  $as_echo "1377. $at_setup_line: testing $at_desc ..."
+  $as_echo "1380. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -186426,7 +187168,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186439,7 +187181,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186476,7 +187218,7 @@
                "b2b": ["set", [["named-uuid", "row2"]]],
                "b2a": ["set", [["named-uuid", "row1"]]]},
        "uuid-name": "row2"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186499,7 +187241,7 @@
       {"op": "insert",
        "table": "a",
        "row": {"a2b": ["set", [["uuid", "b516b960-5b19-4fc2-bb82-fe1cbd6d0241"]]]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186522,7 +187264,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186545,7 +187287,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186568,7 +187310,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186591,7 +187333,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186620,7 +187362,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186638,7 +187380,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186663,7 +187405,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186680,7 +187422,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186696,13 +187438,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1377
-#AT_START_1378
-at_fn_group_banner 1378 'ovsdb-server.at:39' \
+#AT_STOP_1380
+#AT_START_1381
+at_fn_group_banner 1381 'ovsdb-server.at:39' \
   "weak references" "                                " 81
 at_xfail=no
 (
-  $as_echo "1378. $at_setup_line: testing $at_desc ..."
+  $as_echo "1381. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -186712,7 +187454,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186725,7 +187467,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186806,7 +187548,7 @@
        "row": {"b": 3,
                "b2a": ["named-uuid", "row2"]},
        "uuid-name": "row4"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186833,7 +187575,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186860,7 +187602,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186885,7 +187627,7 @@
        "table": "a",
        "row": {"a2a1": ["named-uuid", "me"]},
        "uuid-name": "me"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186908,7 +187650,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 3]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186931,7 +187673,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186954,7 +187696,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -186981,7 +187723,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187008,7 +187750,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187031,7 +187773,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187058,7 +187800,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187085,7 +187827,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187108,7 +187850,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187135,7 +187877,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187162,7 +187904,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187180,7 +187922,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187213,7 +187955,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187230,7 +187972,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187246,13 +187988,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1378
-#AT_START_1379
-at_fn_group_banner 1379 'ovsdb-server.at:39' \
+#AT_STOP_1381
+#AT_START_1382
+at_fn_group_banner 1382 'ovsdb-server.at:39' \
   "immutable columns" "                              " 81
 at_xfail=no
 (
-  $as_echo "1379. $at_setup_line: testing $at_desc ..."
+  $as_echo "1382. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -187262,7 +188004,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187275,7 +188017,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187296,7 +188038,7 @@
        "table": "a",
        "row": {"i": 5},
        "uuid-name": "row1"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187321,7 +188063,7 @@
        "table": "a",
        "row": {"i": 10},
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187346,7 +188088,7 @@
        "table": "a",
        "row": {"i": 5},
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187371,7 +188113,7 @@
        "table": "a",
        "where": [],
        "mutations": [["i", "-=", 5]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187396,7 +188138,7 @@
        "table": "a",
        "where": [],
        "mutations": [["i", "*=", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187414,7 +188156,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187437,7 +188179,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187454,7 +188196,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187470,13 +188212,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1379
-#AT_START_1380
-at_fn_group_banner 1380 'ovsdb-server.at:39' \
+#AT_STOP_1382
+#AT_START_1383
+at_fn_group_banner 1383 'ovsdb-server.at:39' \
   "garbage collection" "                             " 81
 at_xfail=no
 (
-  $as_echo "1380. $at_setup_line: testing $at_desc ..."
+  $as_echo "1383. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
   OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -187486,7 +188228,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187499,7 +188241,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187518,7 +188260,7 @@
       {"op": "insert",
        "table": "a",
        "row": {"a": 0}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187543,7 +188285,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187592,7 +188334,7 @@
        "table": "a",
        "row": {"a": 3},
        "uuid-name": "row3"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187617,7 +188359,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187650,7 +188392,7 @@
        "table": "a",
        "row": {"a": 5, "a2a": ["named-uuid", "row4"]},
        "uuid-name": "row5"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187677,7 +188419,7 @@
        "where": [],
        "columns": ["a"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187702,7 +188444,7 @@
        "table": "a",
        "where": [["a", "==", 4]],
        "row": {"a2a": ["set", []]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187727,7 +188469,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187760,7 +188502,7 @@
        "table": "a",
        "row": {"a": 7, "wa2a": ["named-uuid", "row6"]},
        "uuid-name": "row7"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187785,7 +188527,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187834,7 +188576,7 @@
        "table": "a",
        "row": {"a": 11, "a2a": ["named-uuid", "row8"]},
        "uuid-name": "row11"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187861,7 +188603,7 @@
        "where": [],
        "columns": ["a"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187886,7 +188628,7 @@
        "table": "a",
        "where": [["a", "==", 9]],
        "row": {"a2a": ["set", []]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187911,7 +188653,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187936,7 +188678,7 @@
        "table": "a",
        "row": {"a": 12, "a2a": ["named-uuid", "self"]},
        "uuid-name": "self"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187961,7 +188703,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -187979,7 +188721,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:39"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188013,7 +188755,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:39: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:39"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188030,7 +188772,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188046,13 +188788,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1380
-#AT_START_1381
-at_fn_group_banner 1381 'ovsdb-server.at:43' \
+#AT_STOP_1383
+#AT_START_1384
+at_fn_group_banner 1384 'ovsdb-server.at:43' \
   "truncating corrupted database log" "              " 82
 at_xfail=no
 (
-  $as_echo "1381. $at_setup_line: testing $at_desc ..."
+  $as_echo "1384. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -188065,7 +188807,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:48: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:48"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188086,7 +188828,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:56: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:56"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188109,7 +188851,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:67: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:67"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -188122,7 +188864,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:68: grep 'syntax error: db: parse error.* in header line \"xxx\"' stderr"
 at_fn_check_prepare_trace "ovsdb-server.at:68"
 ( $at_check_trace; grep 'syntax error: db: parse error.* in header line "xxx"' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188145,7 +188887,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:81: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:81"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188159,7 +188901,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:83: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:83"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188179,13 +188921,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1381
-#AT_START_1382
-at_fn_group_banner 1382 'ovsdb-server.at:91' \
+#AT_STOP_1384
+#AT_START_1385
+at_fn_group_banner 1385 'ovsdb-server.at:91' \
   "truncating database log with bad transaction" "   " 82
 at_xfail=no
 (
-  $as_echo "1382. $at_setup_line: testing $at_desc ..."
+  $as_echo "1385. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -188198,7 +188940,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:96: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:96"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188219,7 +188961,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:104: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:104"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188243,7 +188985,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:116: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:116"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -188256,7 +188998,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:117: grep 'syntax \"{\"invalid\":{}}\": unknown table: No table named invalid.' stderr"
 at_fn_check_prepare_trace "ovsdb-server.at:117"
 ( $at_check_trace; grep 'syntax "{"invalid":{}}": unknown table: No table named invalid.' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188279,7 +189021,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:130: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:130"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188293,7 +189035,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:132: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:132"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188313,13 +189055,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1382
-#AT_START_1383
-at_fn_group_banner 1383 'ovsdb-server.at:140' \
+#AT_STOP_1385
+#AT_START_1386
+at_fn_group_banner 1386 'ovsdb-server.at:140' \
   "ovsdb-client get-schema-version" "                " 82
 at_xfail=no
 (
-  $as_echo "1383. $at_setup_line: testing $at_desc ..."
+  $as_echo "1386. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -188329,7 +189071,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:144: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:144"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188342,7 +189084,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:145: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --unixctl=\"\`pwd\`\"/unixctl --remote=punix:socket db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:145"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --unixctl="`pwd`"/unixctl --remote=punix:socket db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188355,7 +189097,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:146: ovsdb-client get-schema-version unix:socket ordinals"
 at_fn_check_prepare_trace "ovsdb-server.at:146"
 ( $at_check_trace; ovsdb-client get-schema-version unix:socket ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188371,7 +189113,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:148: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:148"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188388,7 +189130,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188404,13 +189146,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1383
-#AT_START_1384
-at_fn_group_banner 1384 'ovsdb-server.at:151' \
+#AT_STOP_1386
+#AT_START_1387
+at_fn_group_banner 1387 'ovsdb-server.at:151' \
   "database multiplexing implementation" "           " 82
 at_xfail=no
 (
-  $as_echo "1384. $at_setup_line: testing $at_desc ..."
+  $as_echo "1387. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -188421,7 +189163,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:156: ovsdb-tool create db1 schema1"
 at_fn_check_prepare_trace "ovsdb-server.at:156"
 ( $at_check_trace; ovsdb-tool create db1 schema1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188434,7 +189176,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:157: ovsdb-tool create db2 schema2"
 at_fn_check_prepare_trace "ovsdb-server.at:157"
 ( $at_check_trace; ovsdb-tool create db2 schema2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188447,7 +189189,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:158: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --unixctl=\"\`pwd\`\"/unixctl --remote=punix:socket db1 db2"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:158"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --unixctl="`pwd`"/unixctl --remote=punix:socket db1 db2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188460,7 +189202,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:159: ovsdb-client list-dbs unix:socket"
 at_fn_check_prepare_trace "ovsdb-server.at:159"
 ( $at_check_trace; ovsdb-client list-dbs unix:socket
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188479,7 +189221,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:164: ovstest test-jsonrpc request unix:socket get_schema [\\\"nonexistent\\\"]"
 at_fn_check_prepare_trace "ovsdb-server.at:164"
 ( $at_check_trace; ovstest test-jsonrpc request unix:socket get_schema [\"nonexistent\"]
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188498,7 +189240,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:168: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:168"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188515,7 +189257,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188531,13 +189273,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1384
-#AT_START_1385
-at_fn_group_banner 1385 'ovsdb-server.at:171' \
+#AT_STOP_1387
+#AT_START_1388
+at_fn_group_banner 1388 'ovsdb-server.at:171' \
   "ovsdb-server/add-db and remove-db" "              " 82
 at_xfail=no
 (
-  $as_echo "1385. $at_setup_line: testing $at_desc ..."
+  $as_echo "1388. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -188554,7 +189296,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:178: ovsdb-tool create db1 schema1"
 at_fn_check_prepare_trace "ovsdb-server.at:178"
 ( $at_check_trace; ovsdb-tool create db1 schema1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188567,7 +189309,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:179: ovsdb-tool create db2 schema2"
 at_fn_check_prepare_trace "ovsdb-server.at:179"
 ( $at_check_trace; ovsdb-tool create db2 schema2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188582,7 +189324,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:182: ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db1"
 at_fn_check_prepare_trace "ovsdb-server.at:182"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188595,7 +189337,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:183: ovs-appctl -t ovsdb-server ovsdb-server/list-dbs"
 at_fn_check_prepare_trace "ovsdb-server.at:183"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-dbs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188612,7 +189354,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:188: ovs-appctl -t ovsdb-server ovsdb-server/add-db db2"
 at_fn_check_prepare_trace "ovsdb-server.at:188"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/add-db db2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188625,7 +189367,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:189: ovs-appctl -t ovsdb-server ovsdb-server/list-dbs"
 at_fn_check_prepare_trace "ovsdb-server.at:189"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-dbs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188643,7 +189385,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:195: ovsdb-client list-tables unix:socket constraints"
 at_fn_check_prepare_trace "ovsdb-server.at:195"
 ( $at_check_trace; ovsdb-client list-tables unix:socket constraints
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188656,7 +189398,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:196: ovsdb-client list-tables unix:socket ordinals"
 at_fn_check_prepare_trace "ovsdb-server.at:196"
 ( $at_check_trace; ovsdb-client list-tables unix:socket ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188672,7 +189414,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:200: ovs-appctl -t ovsdb-server ovsdb-server/add-db db2"
 at_fn_check_prepare_trace "ovsdb-server.at:200"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/add-db db2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "I/O error: db2: failed to lock lockfile (Resource deadlock avoided)
@@ -188689,7 +189431,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:205: ovs-appctl -t ovsdb-server ovsdb-server/add-db db2"
 at_fn_check_prepare_trace "ovsdb-server.at:205"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/add-db db2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "db2: already open
@@ -188708,7 +189450,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:212: ovs-appctl -t ovsdb-server ovsdb-server/add-db db3"
 at_fn_check_prepare_trace "ovsdb-server.at:212"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/add-db db3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -188721,7 +189463,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:213: sed 's/(.*)/(...)/' stderr"
 at_fn_check_prepare_trace "ovsdb-server.at:213"
 ( $at_check_trace; sed 's/(.*)/(...)/' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188739,7 +189481,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:219: ovs-appctl -t ovsdb-server ovsdb-server/add-remote db:ordinals,ordinals,name"
 at_fn_check_prepare_trace "ovsdb-server.at:219"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/add-remote db:ordinals,ordinals,name
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188752,7 +189494,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:220: ovs-appctl -t ovsdb-server ovsdb-server/list-remotes"
 at_fn_check_prepare_trace "ovsdb-server.at:220"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-remotes
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188770,7 +189512,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:226: ovs-appctl -t ovsdb-server ovsdb-server/remove-db ordinals"
 at_fn_check_prepare_trace "ovsdb-server.at:226"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/remove-db ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188783,7 +189525,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:227: ovs-appctl -t ovsdb-server ovsdb-server/list-dbs"
 at_fn_check_prepare_trace "ovsdb-server.at:227"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-dbs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188798,7 +189540,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:230: ovs-appctl -t ovsdb-server ovsdb-server/list-remotes"
 at_fn_check_prepare_trace "ovsdb-server.at:230"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-remotes
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188814,7 +189556,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:234: ovsdb-client list-tables unix:socket ordinals"
 at_fn_check_prepare_trace "ovsdb-server.at:234"
 ( $at_check_trace; ovsdb-client list-tables unix:socket ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188829,7 +189571,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:237: ovs-appctl -t ovsdb-server ovsdb-server/remove-db constraints"
 at_fn_check_prepare_trace "ovsdb-server.at:237"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/remove-db constraints
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188842,7 +189584,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:238: ovs-appctl -t ovsdb-server ovsdb-server/list-dbs"
 at_fn_check_prepare_trace "ovsdb-server.at:238"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-dbs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188855,7 +189597,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:240: ovsdb-client list-tables unix:socket constraints"
 at_fn_check_prepare_trace "ovsdb-server.at:240"
 ( $at_check_trace; ovsdb-client list-tables unix:socket constraints
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188870,7 +189612,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:243: ovs-appctl -t ovsdb-server ovsdb-server/remove-db ordinals"
 at_fn_check_prepare_trace "ovsdb-server.at:243"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/remove-db ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "Failed to find the database.
@@ -188888,7 +189630,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:249: ovs-appctl -t ovsdb-server ovsdb-server/add-db db2"
 at_fn_check_prepare_trace "ovsdb-server.at:249"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/add-db db2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188901,7 +189643,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:250: ovs-appctl -t ovsdb-server ovsdb-server/list-dbs"
 at_fn_check_prepare_trace "ovsdb-server.at:250"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-dbs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188916,7 +189658,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:253: ovsdb-client list-tables unix:socket constraints"
 at_fn_check_prepare_trace "ovsdb-server.at:253"
 ( $at_check_trace; ovsdb-client list-tables unix:socket constraints
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188929,13 +189671,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1385
-#AT_START_1386
-at_fn_group_banner 1386 'ovsdb-server.at:256' \
+#AT_STOP_1388
+#AT_START_1389
+at_fn_group_banner 1389 'ovsdb-server.at:256' \
   "ovsdb-server/add-db with --monitor" "             " 82
 at_xfail=no
 (
-  $as_echo "1386. $at_setup_line: testing $at_desc ..."
+  $as_echo "1389. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -188950,7 +189692,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:263: ovsdb-tool create db1 schema"
 at_fn_check_prepare_trace "ovsdb-server.at:263"
 ( $at_check_trace; ovsdb-tool create db1 schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188968,7 +189710,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:265: ovsdb-server -v -vvlog:off --monitor --detach --no-chdir --pidfile --log-file db1"
 at_fn_check_prepare_trace "ovsdb-server.at:265"
 ( $at_check_trace; ovsdb-server -v -vvlog:off --monitor --detach --no-chdir --pidfile --log-file db1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -188984,7 +189726,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:269: ovsdb-tool create db2 schema2"
 at_fn_check_prepare_trace "ovsdb-server.at:269"
 ( $at_check_trace; ovsdb-tool create db2 schema2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -188997,7 +189739,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:270: ovs-appctl -t ovsdb-server ovsdb-server/add-db db2"
 at_fn_check_prepare_trace "ovsdb-server.at:270"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/add-db db2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189010,7 +189752,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:271: ovs-appctl -t ovsdb-server ovsdb-server/list-dbs"
 at_fn_check_prepare_trace "ovsdb-server.at:271"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-dbs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189030,7 +189772,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:279: kill -SEGV \`cat ovsdb-server.pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:279"
 ( $at_check_trace; kill -SEGV `cat ovsdb-server.pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189047,7 +189789,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat old.pid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189064,7 +189806,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s ovsdb-server.pid && test `cat ovsdb-server.pid` != `cat old.pid`
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189077,7 +189819,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:283: ovs-appctl -t ovsdb-server ovsdb-server/list-dbs"
 at_fn_check_prepare_trace "ovsdb-server.at:283"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-dbs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189093,13 +189835,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1386
-#AT_START_1387
-at_fn_group_banner 1387 'ovsdb-server.at:289' \
+#AT_STOP_1389
+#AT_START_1390
+at_fn_group_banner 1390 'ovsdb-server.at:289' \
   "ovsdb-server/add-db and remove-db with --monitor" "" 82
 at_xfail=no
 (
-  $as_echo "1387. $at_setup_line: testing $at_desc ..."
+  $as_echo "1390. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -189114,7 +189856,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:296: ovsdb-tool create db1 schema"
 at_fn_check_prepare_trace "ovsdb-server.at:296"
 ( $at_check_trace; ovsdb-tool create db1 schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189128,7 +189870,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:298: ovsdb-tool create db2 schema2"
 at_fn_check_prepare_trace "ovsdb-server.at:298"
 ( $at_check_trace; ovsdb-tool create db2 schema2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189146,7 +189888,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:300: ovsdb-server -v -vvlog:off --monitor --detach --no-chdir --pidfile --log-file db1 db2"
 at_fn_check_prepare_trace "ovsdb-server.at:300"
 ( $at_check_trace; ovsdb-server -v -vvlog:off --monitor --detach --no-chdir --pidfile --log-file db1 db2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189161,7 +189903,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:303: ovs-appctl -t ovsdb-server ovsdb-server/remove-db constraints"
 at_fn_check_prepare_trace "ovsdb-server.at:303"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/remove-db constraints
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189174,7 +189916,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:304: ovs-appctl -t ovsdb-server ovsdb-server/list-dbs"
 at_fn_check_prepare_trace "ovsdb-server.at:304"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-dbs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189193,7 +189935,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:311: kill -SEGV \`cat ovsdb-server.pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:311"
 ( $at_check_trace; kill -SEGV `cat ovsdb-server.pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189210,7 +189952,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat old.pid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189227,7 +189969,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s ovsdb-server.pid && test `cat ovsdb-server.pid` != `cat old.pid`
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189240,7 +189982,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:315: ovs-appctl -t ovsdb-server ovsdb-server/list-dbs"
 at_fn_check_prepare_trace "ovsdb-server.at:315"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-dbs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189255,13 +189997,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1387
-#AT_START_1388
-at_fn_group_banner 1388 'ovsdb-server.at:320' \
+#AT_STOP_1390
+#AT_START_1391
+at_fn_group_banner 1391 'ovsdb-server.at:320' \
   "--remote=db: implementation" "                    " 82
 at_xfail=no
 (
-  $as_echo "1388. $at_setup_line: testing $at_desc ..."
+  $as_echo "1391. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -189297,7 +190039,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:349: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:349"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189330,7 +190072,7 @@
         "table": "Manager",
         "uuid-name": "x",
         "row": {"target": "punix:socket2"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189348,7 +190090,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:363: ovsdb-server --detach --no-chdir --pidfile --remote=db:mydb,Root,managers --remote=db:mydb,Root,manager_options --log-file db"
 at_fn_check_prepare_trace "ovsdb-server.at:363"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --remote=db:mydb,Root,managers --remote=db:mydb,Root,manager_options --log-file db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189380,7 +190122,7 @@
         "table": "Manager",
         "where": [],
         "columns": ["target", "is_connected"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189393,7 +190135,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:377: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:377"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189408,13 +190150,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1388
-#AT_START_1389
-at_fn_group_banner 1389 'ovsdb-server.at:385' \
+#AT_STOP_1391
+#AT_START_1392
+at_fn_group_banner 1392 'ovsdb-server.at:385' \
   "ovsdb-server/add-remote and remove-remote" "      " 82
 at_xfail=no
 (
-  $as_echo "1389. $at_setup_line: testing $at_desc ..."
+  $as_echo "1392. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -189425,7 +190167,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:390: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:390"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189443,7 +190185,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:392: ovsdb-server --detach --no-chdir --pidfile db"
 at_fn_check_prepare_trace "ovsdb-server.at:392"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189457,7 +190199,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:394: test ! -e socket1"
 at_fn_check_prepare_trace "ovsdb-server.at:394"
 ( $at_check_trace; test ! -e socket1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189470,7 +190212,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:395: ovs-appctl -t ovsdb-server ovsdb-server/add-remote punix:socket1"
 at_fn_check_prepare_trace "ovsdb-server.at:395"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/add-remote punix:socket1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189488,7 +190230,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s socket1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189506,7 +190248,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -S socket1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189520,7 +190262,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:401: ovs-appctl -t ovsdb-server ovsdb-server/list-remotes"
 at_fn_check_prepare_trace "ovsdb-server.at:401"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-remotes
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189536,7 +190278,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:405: test ! -e socket2"
 at_fn_check_prepare_trace "ovsdb-server.at:405"
 ( $at_check_trace; test ! -e socket2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189549,7 +190291,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:406: ovs-appctl -t ovsdb-server ovsdb-server/add-remote punix:socket2"
 at_fn_check_prepare_trace "ovsdb-server.at:406"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/add-remote punix:socket2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189567,7 +190309,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s socket2
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189585,7 +190327,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -S socket2
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189599,7 +190341,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:412: ovs-appctl -t ovsdb-server ovsdb-server/list-remotes"
 at_fn_check_prepare_trace "ovsdb-server.at:412"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-remotes
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189616,7 +190358,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:417: ovs-appctl -t ovsdb-server ovsdb-server/add-remote db:x,y,z"
 at_fn_check_prepare_trace "ovsdb-server.at:417"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/add-remote db:x,y,z
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "\"db:x,y,z\": no database named x
@@ -189633,7 +190375,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:422: ovs-appctl -t ovsdb-server ovsdb-server/remove-remote punix:socket1"
 at_fn_check_prepare_trace "ovsdb-server.at:422"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/remove-remote punix:socket1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189650,7 +190392,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e socket1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189664,7 +190406,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:425: test -s socket2"
 at_fn_check_prepare_trace "ovsdb-server.at:425"
 ( $at_check_trace; test -s socket2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189678,7 +190420,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:427: test -S socket2"
 at_fn_check_prepare_trace "ovsdb-server.at:427"
 ( $at_check_trace; test -S socket2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189692,7 +190434,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:429: ovs-appctl -t ovsdb-server ovsdb-server/list-remotes"
 at_fn_check_prepare_trace "ovsdb-server.at:429"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-remotes
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189708,7 +190450,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:433: ovs-appctl -t ovsdb-server ovsdb-server/remove-remote punix:socket2"
 at_fn_check_prepare_trace "ovsdb-server.at:433"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/remove-remote punix:socket2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189725,7 +190467,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e socket2
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189738,7 +190480,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:435: test ! -e socket1"
 at_fn_check_prepare_trace "ovsdb-server.at:435"
 ( $at_check_trace; test ! -e socket1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189751,7 +190493,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:436: ovs-appctl -t ovsdb-server ovsdb-server/list-remotes"
 at_fn_check_prepare_trace "ovsdb-server.at:436"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-remotes
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189764,13 +190506,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1389
-#AT_START_1390
-at_fn_group_banner 1390 'ovsdb-server.at:439' \
+#AT_STOP_1392
+#AT_START_1393
+at_fn_group_banner 1393 'ovsdb-server.at:439' \
   "ovsdb-server/add-remote with --monitor" "         " 82
 at_xfail=no
 (
-  $as_echo "1390. $at_setup_line: testing $at_desc ..."
+  $as_echo "1393. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -189785,7 +190527,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:446: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:446"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189803,7 +190545,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:448: ovsdb-server -v -vvlog:off --monitor --detach --no-chdir --pidfile --log-file db"
 at_fn_check_prepare_trace "ovsdb-server.at:448"
 ( $at_check_trace; ovsdb-server -v -vvlog:off --monitor --detach --no-chdir --pidfile --log-file db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189818,7 +190560,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:451: test ! -e socket1"
 at_fn_check_prepare_trace "ovsdb-server.at:451"
 ( $at_check_trace; test ! -e socket1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189831,7 +190573,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:452: ovs-appctl -t ovsdb-server ovsdb-server/add-remote punix:socket1"
 at_fn_check_prepare_trace "ovsdb-server.at:452"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/add-remote punix:socket1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189848,7 +190590,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -S socket1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189861,7 +190603,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:454: ovs-appctl -t ovsdb-server ovsdb-server/list-remotes"
 at_fn_check_prepare_trace "ovsdb-server.at:454"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-remotes
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189882,7 +190624,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:463: kill -SEGV \`cat ovsdb-server.pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:463"
 ( $at_check_trace; kill -SEGV `cat ovsdb-server.pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -189899,7 +190641,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat old.pid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189916,7 +190658,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s ovsdb-server.pid && test `cat ovsdb-server.pid` != `cat old.pid`
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189933,7 +190675,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -S socket1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189946,13 +190688,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1390
-#AT_START_1391
-at_fn_group_banner 1391 'ovsdb-server.at:470' \
+#AT_STOP_1393
+#AT_START_1394
+at_fn_group_banner 1394 'ovsdb-server.at:470' \
   "ovsdb-server/add-remote and remove-remote with --monitor" "" 82
 at_xfail=no
 (
-  $as_echo "1391. $at_setup_line: testing $at_desc ..."
+  $as_echo "1394. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -189967,7 +190709,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:477: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:477"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -189985,7 +190727,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:479: ovsdb-server -v -vvlog:off --monitor --detach --no-chdir --pidfile --log-file db"
 at_fn_check_prepare_trace "ovsdb-server.at:479"
 ( $at_check_trace; ovsdb-server -v -vvlog:off --monitor --detach --no-chdir --pidfile --log-file db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190000,7 +190742,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:482: test ! -e socket1"
 at_fn_check_prepare_trace "ovsdb-server.at:482"
 ( $at_check_trace; test ! -e socket1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190013,7 +190755,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:483: ovs-appctl -t ovsdb-server ovsdb-server/add-remote punix:socket1"
 at_fn_check_prepare_trace "ovsdb-server.at:483"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/add-remote punix:socket1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190030,7 +190772,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -S socket1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190043,7 +190785,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:485: ovs-appctl -t ovsdb-server ovsdb-server/list-remotes"
 at_fn_check_prepare_trace "ovsdb-server.at:485"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-remotes
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190060,7 +190802,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:490: ovs-appctl -t ovsdb-server ovsdb-server/remove-remote punix:socket1"
 at_fn_check_prepare_trace "ovsdb-server.at:490"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/remove-remote punix:socket1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190077,7 +190819,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e socket1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190090,7 +190832,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:492: ovs-appctl -t ovsdb-server ovsdb-server/list-remotes"
 at_fn_check_prepare_trace "ovsdb-server.at:492"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/list-remotes
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190108,7 +190850,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:498: kill -SEGV \`cat ovsdb-server.pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:498"
 ( $at_check_trace; kill -SEGV `cat ovsdb-server.pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190125,7 +190867,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat old.pid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190142,7 +190884,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -s ovsdb-server.pid && test `cat ovsdb-server.pid` != `cat old.pid`
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190155,7 +190897,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:502: test ! -e socket1"
 at_fn_check_prepare_trace "ovsdb-server.at:502"
 ( $at_check_trace; test ! -e socket1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190168,13 +190910,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1391
-#AT_START_1392
-at_fn_group_banner 1392 'ovsdb-server.at:505' \
+#AT_STOP_1394
+#AT_START_1395
+at_fn_group_banner 1395 'ovsdb-server.at:505' \
   "SSL db: implementation" "                         " 82
 at_xfail=no
 (
-  $as_echo "1392. $at_setup_line: testing $at_desc ..."
+  $as_echo "1395. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -190203,7 +190945,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:523: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:523"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190228,7 +190970,7 @@
         "row": {"private_key": "'"$PKIDIR/testpki-privkey2.pem"'",
                 "certificate": "'"$PKIDIR/testpki-cert2.pem"'",
                 "ca_cert": "'"$PKIDIR/testpki-cacert.pem"'"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190250,7 +190992,7 @@
         --certificate=db:mydb,SSL,certificate \
         --ca-cert=db:mydb,SSL,ca_cert \
         --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190282,7 +191024,7 @@
            "table": "SSL",
            "where": [],
            "columns": ["private_key"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190299,7 +191041,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:555: cat output"
 at_fn_check_prepare_trace "ovsdb-server.at:555"
 ( $at_check_trace; cat output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190318,7 +191060,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190335,7 +191077,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190351,13 +191093,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1392
-#AT_START_1393
-at_fn_group_banner 1393 'ovsdb-server.at:562' \
+#AT_STOP_1395
+#AT_START_1396
+at_fn_group_banner 1396 'ovsdb-server.at:562' \
   "compacting online" "                              " 82
 at_xfail=no
 (
-  $as_echo "1393. $at_setup_line: testing $at_desc ..."
+  $as_echo "1396. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -190373,7 +191115,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:573: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:573"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190386,7 +191128,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:575: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --unixctl=\"\`pwd\`\"/unixctl --remote=punix:socket --log-file=\"\`pwd\`\"/ovsdb-server.log db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:575"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --unixctl="`pwd`"/unixctl --remote=punix:socket --log-file="`pwd`"/ovsdb-server.log db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190446,7 +191188,7 @@
          {"op": "comment",
           "comment": "add back row for '"$pair"'"}]'
     done
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190463,7 +191205,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:605: \${PERL} \$srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/\"_date\":[0-9]*/\"_date\":0/' | ovstest test-json --multiple -"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:605"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/"_date":0/' | ovstest test-json --multiple -
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190500,7 +191242,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:627: ovsdb-client dump unix:socket ordinals"
 at_fn_check_prepare_trace "ovsdb-server.at:627"
 ( $at_check_trace; ovsdb-client dump unix:socket ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190514,7 +191256,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:629: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:629"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190541,7 +191283,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:641: ovs-appctl -t \"\`pwd\`\"/unixctl ovsdb-server/compact"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:641"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl ovsdb-server/compact
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190558,7 +191300,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:645: test -h db"
 at_fn_check_prepare_trace "ovsdb-server.at:645"
 ( $at_check_trace; test -h db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190572,7 +191314,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:646: test -h .db.~lock~"
 at_fn_check_prepare_trace "ovsdb-server.at:646"
 ( $at_check_trace; test -h .db.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190586,7 +191328,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:647: test -f dir/db"
 at_fn_check_prepare_trace "ovsdb-server.at:647"
 ( $at_check_trace; test -f dir/db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190600,7 +191342,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:648: test -f dir/.db.~lock~"
 at_fn_check_prepare_trace "ovsdb-server.at:648"
 ( $at_check_trace; test -f dir/.db.~lock~
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190615,7 +191357,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:653: test \`wc -l < db\` -eq 4"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:653"
 ( $at_check_trace; test `wc -l < db` -eq 4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190633,7 +191375,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:656: ovsdb-client dump unix:socket ordinals"
 at_fn_check_prepare_trace "ovsdb-server.at:656"
 ( $at_check_trace; ovsdb-client dump unix:socket ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190651,7 +191393,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:658: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:658"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190687,7 +191429,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["number", "<", 3]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190707,7 +191449,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:679: test \`wc -l < db\` -eq 6"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:679"
 ( $at_check_trace; test `wc -l < db` -eq 6
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190725,7 +191467,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:682: ovsdb-client dump unix:socket ordinals"
 at_fn_check_prepare_trace "ovsdb-server.at:682"
 ( $at_check_trace; ovsdb-client dump unix:socket ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190743,7 +191485,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:684: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:684"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190769,7 +191511,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:692: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:692"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190788,7 +191530,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190806,13 +191548,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1393
-#AT_START_1394
-at_fn_group_banner 1394 'ovsdb-server.at:695' \
+#AT_STOP_1396
+#AT_START_1397
+at_fn_group_banner 1397 'ovsdb-server.at:695' \
   "ovsdb-server combines updates on backlogged connections" "" 82
 at_xfail=no
 (
-  $as_echo "1394. $at_setup_line: testing $at_desc ..."
+  $as_echo "1397. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_LOGDIR=`pwd`; export OVS_LOGDIR
@@ -190858,7 +191600,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:727: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovsdb-server.at:727"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190879,7 +191621,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190892,7 +191634,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:728: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db"
 at_fn_check_prepare_trace "ovsdb-server.at:728"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -190935,7 +191677,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:760: ovsdb-client --detach --no-chdir --pidfile=nonblock.pid monitor ALL >ovsdb-client-nonblock.out 2>ovsdb-client-nonblock.err"
 at_fn_check_prepare_trace "ovsdb-server.at:760"
 ( $at_check_trace; ovsdb-client --detach --no-chdir --pidfile=nonblock.pid monitor ALL >ovsdb-client-nonblock.out 2>ovsdb-client-nonblock.err
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190954,7 +191696,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:765: ovsdb-client --detach --no-chdir --pidfile monitor ALL >ovsdb-client.out 2>ovsdb-client.err"
 at_fn_check_prepare_trace "ovsdb-server.at:765"
 ( $at_check_trace; ovsdb-client --detach --no-chdir --pidfile monitor ALL >ovsdb-client.out 2>ovsdb-client.err
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190969,7 +191711,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:766: ovs-appctl -t ovsdb-client ovsdb-client/block"
 at_fn_check_prepare_trace "ovsdb-server.at:766"
 ( $at_check_trace; ovs-appctl -t ovsdb-client ovsdb-client/block
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -190988,7 +191730,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:771: ovs-appctl -t ovsdb-client ovsdb-client/unblock"
 at_fn_check_prepare_trace "ovsdb-server.at:771"
 ( $at_check_trace; ovs-appctl -t ovsdb-client ovsdb-client/unblock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -191007,7 +191749,7 @@
 ( $at_check_trace; ovs_wait_cond () { grep "\"xyzzy$counter\"" ovsdb-client.out
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191026,7 +191768,7 @@
 ( $at_check_trace; ovs_wait_cond () { grep "\"xyzzy$counter\"" ovsdb-client-nonblock.out
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191041,7 +191783,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:774: ovs-appctl -t ovsdb-client exit"
 at_fn_check_prepare_trace "ovsdb-server.at:774"
 ( $at_check_trace; ovs-appctl -t ovsdb-client exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -191060,7 +191802,7 @@
 ( $at_check_trace; ovs_wait_cond () { if test -e ovsdb-client.pid; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191075,7 +191817,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:776: kill \`cat nonblock.pid\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:776"
 ( $at_check_trace; kill `cat nonblock.pid`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -191101,7 +191843,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:788: test \$logged_nonblock_updates -le \$n_updates"
 at_fn_check_prepare_dynamic "test $logged_nonblock_updates -le $n_updates" "ovsdb-server.at:788"
 ( $at_check_trace; test $logged_nonblock_updates -le $n_updates
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -191116,7 +191858,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:789: test \$logged_updates -lt \$logged_nonblock_updates"
 at_fn_check_prepare_dynamic "test $logged_updates -lt $logged_nonblock_updates" "ovsdb-server.at:789"
 ( $at_check_trace; test $logged_updates -lt $logged_nonblock_updates
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -191131,7 +191873,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:790: ovs-vsctl get open_vswitch . system_version"
 at_fn_check_prepare_trace "ovsdb-server.at:790"
 ( $at_check_trace; ovs-vsctl get open_vswitch . system_version
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -191148,13 +191890,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1394
-#AT_START_1395
-at_fn_group_banner 1395 'ovsdb-server.at:832' \
+#AT_STOP_1397
+#AT_START_1398
+at_fn_group_banner 1398 'ovsdb-server.at:832' \
   "insert default row, query table" "                " 83
 at_xfail=no
 (
-  $as_echo "1395. $at_setup_line: testing $at_desc ..."
+  $as_echo "1398. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -191169,7 +191911,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191182,7 +191924,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191202,7 +191944,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191225,7 +191967,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191243,7 +191985,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191263,7 +192005,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191280,7 +192022,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191296,13 +192038,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1395
-#AT_START_1396
-at_fn_group_banner 1396 'ovsdb-server.at:832' \
+#AT_STOP_1398
+#AT_START_1399
+at_fn_group_banner 1399 'ovsdb-server.at:832' \
   "insert row, query table" "                        " 83
 at_xfail=no
 (
-  $as_echo "1396. $at_setup_line: testing $at_desc ..."
+  $as_echo "1399. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -191317,7 +192059,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191330,7 +192072,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191350,7 +192092,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191373,7 +192115,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191391,7 +192133,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191411,7 +192153,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191428,7 +192170,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191444,13 +192186,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1396
-#AT_START_1397
-at_fn_group_banner 1397 'ovsdb-server.at:832' \
+#AT_STOP_1399
+#AT_START_1400
+at_fn_group_banner 1400 'ovsdb-server.at:832' \
   "insert rows, query by value" "                    " 83
 at_xfail=no
 (
-  $as_echo "1397. $at_setup_line: testing $at_desc ..."
+  $as_echo "1400. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -191465,7 +192207,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191478,7 +192220,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191498,7 +192240,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191521,7 +192263,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191544,7 +192286,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["name", "==", "zero"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191567,7 +192309,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["name", "==", "one"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191585,7 +192327,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191607,7 +192349,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191624,7 +192366,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191640,13 +192382,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1397
-#AT_START_1398
-at_fn_group_banner 1398 'ovsdb-server.at:832' \
+#AT_STOP_1400
+#AT_START_1401
+at_fn_group_banner 1401 'ovsdb-server.at:832' \
   "insert rows, query by named-uuid" "               " 83
 at_xfail=no
 (
-  $as_echo "1398. $at_setup_line: testing $at_desc ..."
+  $as_echo "1401. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -191661,7 +192403,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191674,7 +192416,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191716,7 +192458,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["_uuid", "==", ["named-uuid", "second"]]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191734,7 +192476,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191753,7 +192495,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191770,7 +192512,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191786,13 +192528,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1398
-#AT_START_1399
-at_fn_group_banner 1399 'ovsdb-server.at:832' \
+#AT_STOP_1401
+#AT_START_1402
+at_fn_group_banner 1402 'ovsdb-server.at:832' \
   "insert rows, update rows by value" "              " 83
 at_xfail=no
 (
-  $as_echo "1399. $at_setup_line: testing $at_desc ..."
+  $as_echo "1402. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -191807,7 +192549,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191820,7 +192562,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191842,7 +192584,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191867,7 +192609,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191892,7 +192634,7 @@
        "table": "ordinals",
        "where": [["name", "==", "zero"]],
        "row": {"name": "nought"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191917,7 +192659,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191935,7 +192677,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191957,7 +192699,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191974,7 +192716,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -191990,13 +192732,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1399
-#AT_START_1400
-at_fn_group_banner 1400 'ovsdb-server.at:832' \
+#AT_STOP_1402
+#AT_START_1403
+at_fn_group_banner 1403 'ovsdb-server.at:832' \
   "insert rows, mutate rows" "                       " 83
 at_xfail=no
 (
-  $as_echo "1400. $at_setup_line: testing $at_desc ..."
+  $as_echo "1403. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -192011,7 +192753,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192024,7 +192766,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192046,7 +192788,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192071,7 +192813,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192096,7 +192838,7 @@
        "table": "ordinals",
        "where": [["name", "==", "zero"]],
        "mutations": [["number", "+=", 2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192121,7 +192863,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192139,7 +192881,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192161,7 +192903,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192178,7 +192920,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192194,13 +192936,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1400
-#AT_START_1401
-at_fn_group_banner 1401 'ovsdb-server.at:832' \
+#AT_STOP_1403
+#AT_START_1404
+at_fn_group_banner 1404 'ovsdb-server.at:832' \
   "insert rows, delete by named-uuid" "              " 83
 at_xfail=no
 (
-  $as_echo "1401. $at_setup_line: testing $at_desc ..."
+  $as_echo "1404. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -192215,7 +192957,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192228,7 +192970,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192272,7 +193014,7 @@
        "table": "ordinals",
        "where": [],
        "columns": ["name","number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192290,7 +193032,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192309,7 +193051,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192326,7 +193068,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192342,13 +193084,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1401
-#AT_START_1402
-at_fn_group_banner 1402 'ovsdb-server.at:832' \
+#AT_STOP_1404
+#AT_START_1405
+at_fn_group_banner 1405 'ovsdb-server.at:832' \
   "insert rows, delete rows by value" "              " 83
 at_xfail=no
 (
-  $as_echo "1402. $at_setup_line: testing $at_desc ..."
+  $as_echo "1405. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -192363,7 +193105,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192376,7 +193118,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192398,7 +193140,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192423,7 +193165,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192446,7 +193188,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["name", "==", "zero"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192469,7 +193211,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192487,7 +193229,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192509,7 +193251,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192526,7 +193268,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192542,13 +193284,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1402
-#AT_START_1403
-at_fn_group_banner 1403 'ovsdb-server.at:832' \
+#AT_STOP_1405
+#AT_START_1406
+at_fn_group_banner 1406 'ovsdb-server.at:832' \
   "insert rows, delete by (non-matching) value" "    " 83
 at_xfail=no
 (
-  $as_echo "1403. $at_setup_line: testing $at_desc ..."
+  $as_echo "1406. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -192563,7 +193305,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192576,7 +193318,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192598,7 +193340,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192623,7 +193365,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192646,7 +193388,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["name", "==", "nought"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192671,7 +193413,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192689,7 +193431,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192711,7 +193453,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192728,7 +193470,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192744,13 +193486,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1403
-#AT_START_1404
-at_fn_group_banner 1404 'ovsdb-server.at:832' \
+#AT_STOP_1406
+#AT_START_1407
+at_fn_group_banner 1407 'ovsdb-server.at:832' \
   "insert rows, delete all" "                        " 83
 at_xfail=no
 (
-  $as_echo "1404. $at_setup_line: testing $at_desc ..."
+  $as_echo "1407. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -192765,7 +193507,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192778,7 +193520,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192822,7 +193564,7 @@
        "table": "ordinals",
        "where": [],
        "columns": ["name","number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192840,7 +193582,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192859,7 +193601,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192876,7 +193618,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192892,13 +193634,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1404
-#AT_START_1405
-at_fn_group_banner 1405 'ovsdb-server.at:832' \
+#AT_STOP_1407
+#AT_START_1408
+at_fn_group_banner 1408 'ovsdb-server.at:832' \
   "insert row, query table, commit" "                " 83
 at_xfail=no
 (
-  $as_echo "1405. $at_setup_line: testing $at_desc ..."
+  $as_echo "1408. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -192913,7 +193655,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192926,7 +193668,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192956,7 +193698,7 @@
        "where": []},
       {"op": "commit",
        "durable": false}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192974,7 +193716,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -192993,7 +193735,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193010,7 +193752,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193026,13 +193768,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1405
-#AT_START_1406
-at_fn_group_banner 1406 'ovsdb-server.at:832' \
+#AT_STOP_1408
+#AT_START_1409
+at_fn_group_banner 1409 'ovsdb-server.at:832' \
   "insert row, query table, commit durably" "        " 83
 at_xfail=no
 (
-  $as_echo "1406. $at_setup_line: testing $at_desc ..."
+  $as_echo "1409. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -193047,7 +193789,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193060,7 +193802,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193090,7 +193832,7 @@
        "where": []},
       {"op": "commit",
        "durable": true}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193108,7 +193850,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193127,7 +193869,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193144,7 +193886,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193160,13 +193902,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1406
-#AT_START_1407
-at_fn_group_banner 1407 'ovsdb-server.at:832' \
+#AT_STOP_1409
+#AT_START_1410
+at_fn_group_banner 1410 'ovsdb-server.at:832' \
   "equality wait with correct rows" "                " 83
 at_xfail=no
 (
-  $as_echo "1407. $at_setup_line: testing $at_desc ..."
+  $as_echo "1410. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -193181,7 +193923,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193194,7 +193936,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193236,7 +193978,7 @@
        "until": "==",
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193254,7 +193996,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193273,7 +194015,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193290,7 +194032,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193306,13 +194048,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1407
-#AT_START_1408
-at_fn_group_banner 1408 'ovsdb-server.at:832' \
+#AT_STOP_1410
+#AT_START_1411
+at_fn_group_banner 1411 'ovsdb-server.at:832' \
   "equality wait with extra row" "                   " 83
 at_xfail=no
 (
-  $as_echo "1408. $at_setup_line: testing $at_desc ..."
+  $as_echo "1411. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -193327,7 +194069,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193340,7 +194082,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193384,7 +194126,7 @@
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1},
                 {"name": "two", "number": 2}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193402,7 +194144,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193421,7 +194163,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193438,7 +194180,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193454,13 +194196,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1408
-#AT_START_1409
-at_fn_group_banner 1409 'ovsdb-server.at:832' \
+#AT_STOP_1411
+#AT_START_1412
+at_fn_group_banner 1412 'ovsdb-server.at:832' \
   "equality wait with missing row" "                 " 83
 at_xfail=no
 (
-  $as_echo "1409. $at_setup_line: testing $at_desc ..."
+  $as_echo "1412. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -193475,7 +194217,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193488,7 +194230,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193528,7 +194270,7 @@
        "columns": ["name", "number"],
        "until": "==",
        "rows": [{"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193546,7 +194288,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193565,7 +194307,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193582,7 +194324,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193598,13 +194340,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1409
-#AT_START_1410
-at_fn_group_banner 1410 'ovsdb-server.at:832' \
+#AT_STOP_1412
+#AT_START_1413
+at_fn_group_banner 1413 'ovsdb-server.at:832' \
   "inequality wait with correct rows" "              " 83
 at_xfail=no
 (
-  $as_echo "1410. $at_setup_line: testing $at_desc ..."
+  $as_echo "1413. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -193619,7 +194361,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193632,7 +194374,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193674,7 +194416,7 @@
        "until": "!=",
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193692,7 +194434,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193711,7 +194453,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193728,7 +194470,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193744,13 +194486,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1410
-#AT_START_1411
-at_fn_group_banner 1411 'ovsdb-server.at:832' \
+#AT_STOP_1413
+#AT_START_1414
+at_fn_group_banner 1414 'ovsdb-server.at:832' \
   "inequality wait with extra row" "                 " 83
 at_xfail=no
 (
-  $as_echo "1411. $at_setup_line: testing $at_desc ..."
+  $as_echo "1414. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -193765,7 +194507,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193778,7 +194520,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193822,7 +194564,7 @@
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1},
                 {"name": "two", "number": 2}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193840,7 +194582,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193859,7 +194601,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193876,7 +194618,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193892,13 +194634,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1411
-#AT_START_1412
-at_fn_group_banner 1412 'ovsdb-server.at:832' \
+#AT_STOP_1414
+#AT_START_1415
+at_fn_group_banner 1415 'ovsdb-server.at:832' \
   "inequality wait with missing row" "               " 83
 at_xfail=no
 (
-  $as_echo "1412. $at_setup_line: testing $at_desc ..."
+  $as_echo "1415. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -193913,7 +194655,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193926,7 +194668,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193966,7 +194708,7 @@
        "columns": ["name", "number"],
        "until": "!=",
        "rows": [{"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -193984,7 +194726,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194003,7 +194745,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194020,7 +194762,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194036,13 +194778,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1412
-#AT_START_1413
-at_fn_group_banner 1413 'ovsdb-server.at:832' \
+#AT_STOP_1415
+#AT_START_1416
+at_fn_group_banner 1416 'ovsdb-server.at:832' \
   "insert and update constraints" "                  " 83
 at_xfail=no
 (
-  $as_echo "1413. $at_setup_line: testing $at_desc ..."
+  $as_echo "1416. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -194057,7 +194799,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194070,7 +194812,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194090,7 +194832,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194113,7 +194855,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": -1}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194138,7 +194880,7 @@
        "table": "constrained",
        "where": [],
        "row": {"positive": -2}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194161,7 +194903,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": 1}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194184,7 +194926,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": 2}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194202,7 +194944,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194225,7 +194967,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194242,7 +194984,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194258,13 +195000,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1413
-#AT_START_1414
-at_fn_group_banner 1414 'ovsdb-server.at:832' \
+#AT_STOP_1416
+#AT_START_1417
+at_fn_group_banner 1417 'ovsdb-server.at:832' \
   "index uniqueness checking" "                      " 83
 at_xfail=no
 (
-  $as_echo "1414. $at_setup_line: testing $at_desc ..."
+  $as_echo "1417. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -194279,7 +195021,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194292,7 +195034,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194312,7 +195054,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194335,7 +195077,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "another one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194364,7 +195106,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["name", "==", "one"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194399,7 +195141,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "still another one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194422,7 +195164,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 2, "name": "two"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194447,7 +195189,7 @@
        "table": "ordinals",
        "where": [],
        "row": {"number": 3}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194480,7 +195222,7 @@
        "table": "ordinals",
        "where": [["name", "==", "two"]],
        "row": {"number": 1, "name": "old one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194527,7 +195269,7 @@
        "where": [],
        "columns": ["number", "name"],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194545,7 +195287,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194571,7 +195313,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194588,7 +195330,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194604,13 +195346,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1414
-#AT_START_1415
-at_fn_group_banner 1415 'ovsdb-server.at:832' \
+#AT_STOP_1417
+#AT_START_1418
+at_fn_group_banner 1418 'ovsdb-server.at:832' \
   "referential integrity -- simple" "                " 83
 at_xfail=no
 (
-  $as_echo "1415. $at_setup_line: testing $at_desc ..."
+  $as_echo "1418. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -194625,7 +195367,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194638,7 +195380,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194684,7 +195426,7 @@
        "table": "a",
        "row": {"a": 2,
                "a2b": ["set", [["named-uuid", "brow"]]]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194707,7 +195449,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194732,7 +195474,7 @@
        "table": "b",
        "where": [],
        "mutations": [["x", "delete", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194755,7 +195497,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194778,7 +195520,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194801,7 +195543,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194824,7 +195566,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194847,7 +195589,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194870,7 +195612,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194888,7 +195630,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194915,7 +195657,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194932,7 +195674,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194948,13 +195690,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1415
-#AT_START_1416
-at_fn_group_banner 1416 'ovsdb-server.at:832' \
+#AT_STOP_1418
+#AT_START_1419
+at_fn_group_banner 1419 'ovsdb-server.at:832' \
   "referential integrity -- mutual references" "     " 83
 at_xfail=no
 (
-  $as_echo "1416. $at_setup_line: testing $at_desc ..."
+  $as_echo "1419. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -194969,7 +195711,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -194982,7 +195724,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195020,7 +195762,7 @@
                "b2b": ["set", [["named-uuid", "row2"]]],
                "b2a": ["set", [["named-uuid", "row1"]]]},
        "uuid-name": "row2"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195043,7 +195785,7 @@
       {"op": "insert",
        "table": "a",
        "row": {"a2b": ["set", [["uuid", "b516b960-5b19-4fc2-bb82-fe1cbd6d0241"]]]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195066,7 +195808,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195089,7 +195831,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195112,7 +195854,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195135,7 +195877,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195164,7 +195906,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195182,7 +195924,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195207,7 +195949,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195224,7 +195966,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195240,13 +195982,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1416
-#AT_START_1417
-at_fn_group_banner 1417 'ovsdb-server.at:832' \
+#AT_STOP_1419
+#AT_START_1420
+at_fn_group_banner 1420 'ovsdb-server.at:832' \
   "weak references" "                                " 83
 at_xfail=no
 (
-  $as_echo "1417. $at_setup_line: testing $at_desc ..."
+  $as_echo "1420. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -195261,7 +196003,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195274,7 +196016,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195356,7 +196098,7 @@
        "row": {"b": 3,
                "b2a": ["named-uuid", "row2"]},
        "uuid-name": "row4"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195383,7 +196125,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195410,7 +196152,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195435,7 +196177,7 @@
        "table": "a",
        "row": {"a2a1": ["named-uuid", "me"]},
        "uuid-name": "me"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195458,7 +196200,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 3]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195481,7 +196223,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195504,7 +196246,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195531,7 +196273,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195558,7 +196300,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195581,7 +196323,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195608,7 +196350,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195635,7 +196377,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195658,7 +196400,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195685,7 +196427,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195712,7 +196454,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195730,7 +196472,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195763,7 +196505,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195780,7 +196522,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195796,13 +196538,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1417
-#AT_START_1418
-at_fn_group_banner 1418 'ovsdb-server.at:832' \
+#AT_STOP_1420
+#AT_START_1421
+at_fn_group_banner 1421 'ovsdb-server.at:832' \
   "immutable columns" "                              " 83
 at_xfail=no
 (
-  $as_echo "1418. $at_setup_line: testing $at_desc ..."
+  $as_echo "1421. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -195817,7 +196559,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195830,7 +196572,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195852,7 +196594,7 @@
        "table": "a",
        "row": {"i": 5},
        "uuid-name": "row1"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195877,7 +196619,7 @@
        "table": "a",
        "row": {"i": 10},
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195902,7 +196644,7 @@
        "table": "a",
        "row": {"i": 5},
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195927,7 +196669,7 @@
        "table": "a",
        "where": [],
        "mutations": [["i", "-=", 5]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195952,7 +196694,7 @@
        "table": "a",
        "where": [],
        "mutations": [["i", "*=", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195970,7 +196712,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -195993,7 +196735,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196010,7 +196752,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196026,13 +196768,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1418
-#AT_START_1419
-at_fn_group_banner 1419 'ovsdb-server.at:832' \
+#AT_STOP_1421
+#AT_START_1422
+at_fn_group_banner 1422 'ovsdb-server.at:832' \
   "garbage collection" "                             " 83
 at_xfail=no
 (
-  $as_echo "1419. $at_setup_line: testing $at_desc ..."
+  $as_echo "1422. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -196047,7 +196789,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196060,7 +196802,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196080,7 +196822,7 @@
       {"op": "insert",
        "table": "a",
        "row": {"a": 0}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196105,7 +196847,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196154,7 +196896,7 @@
        "table": "a",
        "row": {"a": 3},
        "uuid-name": "row3"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196179,7 +196921,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196212,7 +196954,7 @@
        "table": "a",
        "row": {"a": 5, "a2a": ["named-uuid", "row4"]},
        "uuid-name": "row5"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196239,7 +196981,7 @@
        "where": [],
        "columns": ["a"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196264,7 +197006,7 @@
        "table": "a",
        "where": [["a", "==", 4]],
        "row": {"a2a": ["set", []]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196289,7 +197031,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196322,7 +197064,7 @@
        "table": "a",
        "row": {"a": 7, "wa2a": ["named-uuid", "row6"]},
        "uuid-name": "row7"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196347,7 +197089,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196396,7 +197138,7 @@
        "table": "a",
        "row": {"a": 11, "a2a": ["named-uuid", "row8"]},
        "uuid-name": "row11"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196423,7 +197165,7 @@
        "where": [],
        "columns": ["a"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196448,7 +197190,7 @@
        "table": "a",
        "where": [["a", "==", 9]],
        "row": {"a2a": ["set", []]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196473,7 +197215,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196498,7 +197240,7 @@
        "table": "a",
        "row": {"a": 12, "a2a": ["named-uuid", "self"]},
        "uuid-name": "self"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196523,7 +197265,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196541,7 +197283,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:832"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196575,7 +197317,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:832: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:832"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196592,7 +197334,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196608,13 +197350,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1419
-#AT_START_1420
-at_fn_group_banner 1420 'ovsdb-server.at:871' \
+#AT_STOP_1422
+#AT_START_1423
+at_fn_group_banner 1423 'ovsdb-server.at:871' \
   "insert default row, query table" "                " 84
 at_xfail=no
 (
-  $as_echo "1420. $at_setup_line: testing $at_desc ..."
+  $as_echo "1423. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -196629,7 +197371,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:871: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:871"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196642,7 +197384,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:871: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --private-key=\$PKIDIR/testpki-privkey2.pem --certificate=\$PKIDIR/testpki-cert2.pem --ca-cert=\$PKIDIR/testpki-cacert.pem --remote=pssl:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:871"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196662,7 +197404,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196685,7 +197427,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196703,7 +197445,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:871: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:871"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196723,7 +197465,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:871: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:871"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196740,7 +197482,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196756,13 +197498,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1420
-#AT_START_1421
-at_fn_group_banner 1421 'ovsdb-server.at:875' \
+#AT_STOP_1423
+#AT_START_1424
+at_fn_group_banner 1424 'ovsdb-server.at:875' \
   "ovsdb-client get-schema-version - tcp socket" "   " 85
 at_xfail=no
 (
-  $as_echo "1421. $at_setup_line: testing $at_desc ..."
+  $as_echo "1424. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -196771,7 +197513,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:878: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:878"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196785,7 +197527,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:880: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --unixctl=\"\`pwd\`\"/unixctl --remote=ptcp:0:127.0.0.1 db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:880"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --unixctl="`pwd`"/unixctl --remote=ptcp:0:127.0.0.1 db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196799,7 +197541,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:882: ovsdb-client get-schema-version tcp:127.0.0.1:\$TCP_PORT ordinals"
 at_fn_check_prepare_dynamic "ovsdb-client get-schema-version tcp:127.0.0.1:$TCP_PORT ordinals" "ovsdb-server.at:882"
 ( $at_check_trace; ovsdb-client get-schema-version tcp:127.0.0.1:$TCP_PORT ordinals
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -196815,7 +197557,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:884: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:884"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196832,7 +197574,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196848,13 +197590,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1421
-#AT_START_1422
-at_fn_group_banner 1422 'ovsdb-server.at:921' \
+#AT_STOP_1424
+#AT_START_1425
+at_fn_group_banner 1425 'ovsdb-server.at:921' \
   "insert default row, query table" "                " 85
 at_xfail=no
 (
-  $as_echo "1422. $at_setup_line: testing $at_desc ..."
+  $as_echo "1425. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -196866,7 +197608,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196879,7 +197621,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196899,7 +197641,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196922,7 +197664,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196940,7 +197682,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196960,7 +197702,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196977,7 +197719,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -196993,13 +197735,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1422
-#AT_START_1423
-at_fn_group_banner 1423 'ovsdb-server.at:921' \
+#AT_STOP_1425
+#AT_START_1426
+at_fn_group_banner 1426 'ovsdb-server.at:921' \
   "insert row, query table" "                        " 85
 at_xfail=no
 (
-  $as_echo "1423. $at_setup_line: testing $at_desc ..."
+  $as_echo "1426. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -197011,7 +197753,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197024,7 +197766,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197044,7 +197786,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197067,7 +197809,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197085,7 +197827,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197105,7 +197847,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197122,7 +197864,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197138,13 +197880,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1423
-#AT_START_1424
-at_fn_group_banner 1424 'ovsdb-server.at:921' \
+#AT_STOP_1426
+#AT_START_1427
+at_fn_group_banner 1427 'ovsdb-server.at:921' \
   "insert rows, query by value" "                    " 85
 at_xfail=no
 (
-  $as_echo "1424. $at_setup_line: testing $at_desc ..."
+  $as_echo "1427. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -197156,7 +197898,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197169,7 +197911,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197189,7 +197931,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197212,7 +197954,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197235,7 +197977,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["name", "==", "zero"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197258,7 +198000,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["name", "==", "one"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197276,7 +198018,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197298,7 +198040,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197315,7 +198057,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197331,13 +198073,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1424
-#AT_START_1425
-at_fn_group_banner 1425 'ovsdb-server.at:921' \
+#AT_STOP_1427
+#AT_START_1428
+at_fn_group_banner 1428 'ovsdb-server.at:921' \
   "insert rows, query by named-uuid" "               " 85
 at_xfail=no
 (
-  $as_echo "1425. $at_setup_line: testing $at_desc ..."
+  $as_echo "1428. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -197349,7 +198091,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197362,7 +198104,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197404,7 +198146,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": [["_uuid", "==", ["named-uuid", "second"]]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197422,7 +198164,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197441,7 +198183,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197458,7 +198200,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197474,13 +198216,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1425
-#AT_START_1426
-at_fn_group_banner 1426 'ovsdb-server.at:921' \
+#AT_STOP_1428
+#AT_START_1429
+at_fn_group_banner 1429 'ovsdb-server.at:921' \
   "insert rows, update rows by value" "              " 85
 at_xfail=no
 (
-  $as_echo "1426. $at_setup_line: testing $at_desc ..."
+  $as_echo "1429. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -197492,7 +198234,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197505,7 +198247,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197527,7 +198269,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197552,7 +198294,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197577,7 +198319,7 @@
        "table": "ordinals",
        "where": [["name", "==", "zero"]],
        "row": {"name": "nought"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197602,7 +198344,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197620,7 +198362,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197642,7 +198384,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197659,7 +198401,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197675,13 +198417,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1426
-#AT_START_1427
-at_fn_group_banner 1427 'ovsdb-server.at:921' \
+#AT_STOP_1429
+#AT_START_1430
+at_fn_group_banner 1430 'ovsdb-server.at:921' \
   "insert rows, mutate rows" "                       " 85
 at_xfail=no
 (
-  $as_echo "1427. $at_setup_line: testing $at_desc ..."
+  $as_echo "1430. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -197693,7 +198435,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197706,7 +198448,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197728,7 +198470,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197753,7 +198495,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197778,7 +198520,7 @@
        "table": "ordinals",
        "where": [["name", "==", "zero"]],
        "mutations": [["number", "+=", 2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197803,7 +198545,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197821,7 +198563,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197843,7 +198585,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197860,7 +198602,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197876,13 +198618,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1427
-#AT_START_1428
-at_fn_group_banner 1428 'ovsdb-server.at:921' \
+#AT_STOP_1430
+#AT_START_1431
+at_fn_group_banner 1431 'ovsdb-server.at:921' \
   "insert rows, delete by named-uuid" "              " 85
 at_xfail=no
 (
-  $as_echo "1428. $at_setup_line: testing $at_desc ..."
+  $as_echo "1431. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -197894,7 +198636,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197907,7 +198649,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197951,7 +198693,7 @@
        "table": "ordinals",
        "where": [],
        "columns": ["name","number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197969,7 +198711,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -197988,7 +198730,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198005,7 +198747,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198021,13 +198763,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1428
-#AT_START_1429
-at_fn_group_banner 1429 'ovsdb-server.at:921' \
+#AT_STOP_1431
+#AT_START_1432
+at_fn_group_banner 1432 'ovsdb-server.at:921' \
   "insert rows, delete rows by value" "              " 85
 at_xfail=no
 (
-  $as_echo "1429. $at_setup_line: testing $at_desc ..."
+  $as_echo "1432. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -198039,7 +198781,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198052,7 +198794,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198074,7 +198816,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198099,7 +198841,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198122,7 +198864,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["name", "==", "zero"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198145,7 +198887,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198163,7 +198905,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198185,7 +198927,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198202,7 +198944,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198218,13 +198960,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1429
-#AT_START_1430
-at_fn_group_banner 1430 'ovsdb-server.at:921' \
+#AT_STOP_1432
+#AT_START_1433
+at_fn_group_banner 1433 'ovsdb-server.at:921' \
   "insert rows, delete by (non-matching) value" "    " 85
 at_xfail=no
 (
-  $as_echo "1430. $at_setup_line: testing $at_desc ..."
+  $as_echo "1433. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -198236,7 +198978,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198249,7 +198991,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198271,7 +199013,7 @@
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198296,7 +199038,7 @@
        "table": "ordinals",
        "row": {"number": 1, "name": "one"},
        "uuid-name": "first"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198319,7 +199061,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["name", "==", "nought"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198344,7 +199086,7 @@
        "table": "ordinals",
        "where": [],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198362,7 +199104,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198384,7 +199126,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198401,7 +199143,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198417,13 +199159,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1430
-#AT_START_1431
-at_fn_group_banner 1431 'ovsdb-server.at:921' \
+#AT_STOP_1433
+#AT_START_1434
+at_fn_group_banner 1434 'ovsdb-server.at:921' \
   "insert rows, delete all" "                        " 85
 at_xfail=no
 (
-  $as_echo "1431. $at_setup_line: testing $at_desc ..."
+  $as_echo "1434. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -198435,7 +199177,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198448,7 +199190,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198492,7 +199234,7 @@
        "table": "ordinals",
        "where": [],
        "columns": ["name","number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198510,7 +199252,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198529,7 +199271,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198546,7 +199288,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198562,13 +199304,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1431
-#AT_START_1432
-at_fn_group_banner 1432 'ovsdb-server.at:921' \
+#AT_STOP_1434
+#AT_START_1435
+at_fn_group_banner 1435 'ovsdb-server.at:921' \
   "insert row, query table, commit" "                " 85
 at_xfail=no
 (
-  $as_echo "1432. $at_setup_line: testing $at_desc ..."
+  $as_echo "1435. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -198580,7 +199322,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198593,7 +199335,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198623,7 +199365,7 @@
        "where": []},
       {"op": "commit",
        "durable": false}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198641,7 +199383,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198660,7 +199402,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198677,7 +199419,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198693,13 +199435,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1432
-#AT_START_1433
-at_fn_group_banner 1433 'ovsdb-server.at:921' \
+#AT_STOP_1435
+#AT_START_1436
+at_fn_group_banner 1436 'ovsdb-server.at:921' \
   "insert row, query table, commit durably" "        " 85
 at_xfail=no
 (
-  $as_echo "1433. $at_setup_line: testing $at_desc ..."
+  $as_echo "1436. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -198711,7 +199453,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198724,7 +199466,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198754,7 +199496,7 @@
        "where": []},
       {"op": "commit",
        "durable": true}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198772,7 +199514,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198791,7 +199533,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198808,7 +199550,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198824,13 +199566,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1433
-#AT_START_1434
-at_fn_group_banner 1434 'ovsdb-server.at:921' \
+#AT_STOP_1436
+#AT_START_1437
+at_fn_group_banner 1437 'ovsdb-server.at:921' \
   "equality wait with correct rows" "                " 85
 at_xfail=no
 (
-  $as_echo "1434. $at_setup_line: testing $at_desc ..."
+  $as_echo "1437. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -198842,7 +199584,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198855,7 +199597,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198897,7 +199639,7 @@
        "until": "==",
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198915,7 +199657,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198934,7 +199676,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198951,7 +199693,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198967,13 +199709,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1434
-#AT_START_1435
-at_fn_group_banner 1435 'ovsdb-server.at:921' \
+#AT_STOP_1437
+#AT_START_1438
+at_fn_group_banner 1438 'ovsdb-server.at:921' \
   "equality wait with extra row" "                   " 85
 at_xfail=no
 (
-  $as_echo "1435. $at_setup_line: testing $at_desc ..."
+  $as_echo "1438. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -198985,7 +199727,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -198998,7 +199740,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199042,7 +199784,7 @@
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1},
                 {"name": "two", "number": 2}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199060,7 +199802,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199079,7 +199821,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199096,7 +199838,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199112,13 +199854,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1435
-#AT_START_1436
-at_fn_group_banner 1436 'ovsdb-server.at:921' \
+#AT_STOP_1438
+#AT_START_1439
+at_fn_group_banner 1439 'ovsdb-server.at:921' \
   "equality wait with missing row" "                 " 85
 at_xfail=no
 (
-  $as_echo "1436. $at_setup_line: testing $at_desc ..."
+  $as_echo "1439. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -199130,7 +199872,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199143,7 +199885,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199183,7 +199925,7 @@
        "columns": ["name", "number"],
        "until": "==",
        "rows": [{"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199201,7 +199943,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199220,7 +199962,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199237,7 +199979,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199253,13 +199995,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1436
-#AT_START_1437
-at_fn_group_banner 1437 'ovsdb-server.at:921' \
+#AT_STOP_1439
+#AT_START_1440
+at_fn_group_banner 1440 'ovsdb-server.at:921' \
   "inequality wait with correct rows" "              " 85
 at_xfail=no
 (
-  $as_echo "1437. $at_setup_line: testing $at_desc ..."
+  $as_echo "1440. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -199271,7 +200013,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199284,7 +200026,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199326,7 +200068,7 @@
        "until": "!=",
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199344,7 +200086,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199363,7 +200105,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199380,7 +200122,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199396,13 +200138,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1437
-#AT_START_1438
-at_fn_group_banner 1438 'ovsdb-server.at:921' \
+#AT_STOP_1440
+#AT_START_1441
+at_fn_group_banner 1441 'ovsdb-server.at:921' \
   "inequality wait with extra row" "                 " 85
 at_xfail=no
 (
-  $as_echo "1438. $at_setup_line: testing $at_desc ..."
+  $as_echo "1441. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -199414,7 +200156,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199427,7 +200169,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199471,7 +200213,7 @@
        "rows": [{"name": "zero", "number": 0},
                 {"name": "one", "number": 1},
                 {"name": "two", "number": 2}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199489,7 +200231,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199508,7 +200250,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199525,7 +200267,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199541,13 +200283,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1438
-#AT_START_1439
-at_fn_group_banner 1439 'ovsdb-server.at:921' \
+#AT_STOP_1441
+#AT_START_1442
+at_fn_group_banner 1442 'ovsdb-server.at:921' \
   "inequality wait with missing row" "               " 85
 at_xfail=no
 (
-  $as_echo "1439. $at_setup_line: testing $at_desc ..."
+  $as_echo "1442. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -199559,7 +200301,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199572,7 +200314,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199612,7 +200354,7 @@
        "columns": ["name", "number"],
        "until": "!=",
        "rows": [{"name": "one", "number": 1}]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199630,7 +200372,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199649,7 +200391,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199666,7 +200408,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199682,13 +200424,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1439
-#AT_START_1440
-at_fn_group_banner 1440 'ovsdb-server.at:921' \
+#AT_STOP_1442
+#AT_START_1443
+at_fn_group_banner 1443 'ovsdb-server.at:921' \
   "insert and update constraints" "                  " 85
 at_xfail=no
 (
-  $as_echo "1440. $at_setup_line: testing $at_desc ..."
+  $as_echo "1443. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -199700,7 +200442,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199713,7 +200455,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199733,7 +200475,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199756,7 +200498,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": -1}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199781,7 +200523,7 @@
        "table": "constrained",
        "where": [],
        "row": {"positive": -2}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199804,7 +200546,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": 1}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199827,7 +200569,7 @@
       {"op": "insert",
        "table": "constrained",
        "row": {"positive": 2}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199845,7 +200587,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199868,7 +200610,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199885,7 +200627,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199901,13 +200643,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1440
-#AT_START_1441
-at_fn_group_banner 1441 'ovsdb-server.at:921' \
+#AT_STOP_1443
+#AT_START_1444
+at_fn_group_banner 1444 'ovsdb-server.at:921' \
   "index uniqueness checking" "                      " 85
 at_xfail=no
 (
-  $as_echo "1441. $at_setup_line: testing $at_desc ..."
+  $as_echo "1444. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -199919,7 +200661,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199932,7 +200674,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199952,7 +200694,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -199975,7 +200717,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "another one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200004,7 +200746,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["name", "==", "one"]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200039,7 +200781,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "still another one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200062,7 +200804,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 2, "name": "two"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200087,7 +200829,7 @@
        "table": "ordinals",
        "where": [],
        "row": {"number": 3}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200120,7 +200862,7 @@
        "table": "ordinals",
        "where": [["name", "==", "two"]],
        "row": {"number": 1, "name": "old one"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200167,7 +200909,7 @@
        "where": [],
        "columns": ["number", "name"],
        "sort": ["number"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200185,7 +200927,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200211,7 +200953,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200228,7 +200970,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200244,13 +200986,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1441
-#AT_START_1442
-at_fn_group_banner 1442 'ovsdb-server.at:921' \
+#AT_STOP_1444
+#AT_START_1445
+at_fn_group_banner 1445 'ovsdb-server.at:921' \
   "referential integrity -- simple" "                " 85
 at_xfail=no
 (
-  $as_echo "1442. $at_setup_line: testing $at_desc ..."
+  $as_echo "1445. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -200262,7 +201004,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200275,7 +201017,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200321,7 +201063,7 @@
        "table": "a",
        "row": {"a": 2,
                "a2b": ["set", [["named-uuid", "brow"]]]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200344,7 +201086,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200369,7 +201111,7 @@
        "table": "b",
        "where": [],
        "mutations": [["x", "delete", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200392,7 +201134,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200415,7 +201157,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200438,7 +201180,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200461,7 +201203,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200484,7 +201226,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200507,7 +201249,7 @@
       {"op": "delete",
        "table": "b",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200525,7 +201267,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200552,7 +201294,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200569,7 +201311,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200585,13 +201327,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1442
-#AT_START_1443
-at_fn_group_banner 1443 'ovsdb-server.at:921' \
+#AT_STOP_1445
+#AT_START_1446
+at_fn_group_banner 1446 'ovsdb-server.at:921' \
   "referential integrity -- mutual references" "     " 85
 at_xfail=no
 (
-  $as_echo "1443. $at_setup_line: testing $at_desc ..."
+  $as_echo "1446. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -200603,7 +201345,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200616,7 +201358,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200654,7 +201396,7 @@
                "b2b": ["set", [["named-uuid", "row2"]]],
                "b2a": ["set", [["named-uuid", "row1"]]]},
        "uuid-name": "row2"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200677,7 +201419,7 @@
       {"op": "insert",
        "table": "a",
        "row": {"a2b": ["set", [["uuid", "b516b960-5b19-4fc2-bb82-fe1cbd6d0241"]]]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200700,7 +201442,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200723,7 +201465,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200746,7 +201488,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200769,7 +201511,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200798,7 +201540,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200816,7 +201558,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200841,7 +201583,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200858,7 +201600,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200874,13 +201616,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1443
-#AT_START_1444
-at_fn_group_banner 1444 'ovsdb-server.at:921' \
+#AT_STOP_1446
+#AT_START_1447
+at_fn_group_banner 1447 'ovsdb-server.at:921' \
   "weak references" "                                " 85
 at_xfail=no
 (
-  $as_echo "1444. $at_setup_line: testing $at_desc ..."
+  $as_echo "1447. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -200892,7 +201634,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200905,7 +201647,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -200987,7 +201729,7 @@
        "row": {"b": 3,
                "b2a": ["named-uuid", "row2"]},
        "uuid-name": "row4"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201014,7 +201756,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201041,7 +201783,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201066,7 +201808,7 @@
        "table": "a",
        "row": {"a2a1": ["named-uuid", "me"]},
        "uuid-name": "me"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201089,7 +201831,7 @@
       {"op": "delete",
        "table": "b",
        "where": [["b", "==", 3]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201112,7 +201854,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201135,7 +201877,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 2]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201162,7 +201904,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201189,7 +201931,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201212,7 +201954,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201239,7 +201981,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201266,7 +202008,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201289,7 +202031,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201316,7 +202058,7 @@
        "where": [],
        "columns": ["_uuid", "a2a", "a2a1", "a2b"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201343,7 +202085,7 @@
        "where": [],
        "columns": ["_uuid", "b", "b2a"],
        "sort": ["b"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201361,7 +202103,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201394,7 +202136,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201411,7 +202153,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201427,13 +202169,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1444
-#AT_START_1445
-at_fn_group_banner 1445 'ovsdb-server.at:921' \
+#AT_STOP_1447
+#AT_START_1448
+at_fn_group_banner 1448 'ovsdb-server.at:921' \
   "immutable columns" "                              " 85
 at_xfail=no
 (
-  $as_echo "1445. $at_setup_line: testing $at_desc ..."
+  $as_echo "1448. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -201445,7 +202187,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201458,7 +202200,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201480,7 +202222,7 @@
        "table": "a",
        "row": {"i": 5},
        "uuid-name": "row1"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201505,7 +202247,7 @@
        "table": "a",
        "row": {"i": 10},
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201530,7 +202272,7 @@
        "table": "a",
        "row": {"i": 5},
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201555,7 +202297,7 @@
        "table": "a",
        "where": [],
        "mutations": [["i", "-=", 5]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201580,7 +202322,7 @@
        "table": "a",
        "where": [],
        "mutations": [["i", "*=", 1]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201598,7 +202340,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201621,7 +202363,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201638,7 +202380,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201654,13 +202396,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1445
-#AT_START_1446
-at_fn_group_banner 1446 'ovsdb-server.at:921' \
+#AT_STOP_1448
+#AT_START_1449
+at_fn_group_banner 1449 'ovsdb-server.at:921' \
   "garbage collection" "                             " 85
 at_xfail=no
 (
-  $as_echo "1446. $at_setup_line: testing $at_desc ..."
+  $as_echo "1449. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -201672,7 +202414,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201685,7 +202427,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201705,7 +202447,7 @@
       {"op": "insert",
        "table": "a",
        "row": {"a": 0}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201730,7 +202472,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201779,7 +202521,7 @@
        "table": "a",
        "row": {"a": 3},
        "uuid-name": "row3"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201804,7 +202546,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201837,7 +202579,7 @@
        "table": "a",
        "row": {"a": 5, "a2a": ["named-uuid", "row4"]},
        "uuid-name": "row5"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201864,7 +202606,7 @@
        "where": [],
        "columns": ["a"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201889,7 +202631,7 @@
        "table": "a",
        "where": [["a", "==", 4]],
        "row": {"a2a": ["set", []]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201914,7 +202656,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201947,7 +202689,7 @@
        "table": "a",
        "row": {"a": 7, "wa2a": ["named-uuid", "row6"]},
        "uuid-name": "row7"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -201972,7 +202714,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202021,7 +202763,7 @@
        "table": "a",
        "row": {"a": 11, "a2a": ["named-uuid", "row8"]},
        "uuid-name": "row11"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202048,7 +202790,7 @@
        "where": [],
        "columns": ["a"],
        "sort": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202073,7 +202815,7 @@
        "table": "a",
        "where": [["a", "==", 9]],
        "row": {"a2a": ["set", []]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202098,7 +202840,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202123,7 +202865,7 @@
        "table": "a",
        "row": {"a": 12, "a2a": ["named-uuid", "self"]},
        "uuid-name": "self"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202148,7 +202890,7 @@
        "table": "a",
        "where": [],
        "columns": ["a"]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202166,7 +202908,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:921"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202200,7 +202942,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:921: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:921"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202217,7 +202959,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202233,13 +202975,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1446
-#AT_START_1447
-at_fn_group_banner 1447 'ovsdb-server.at:959' \
+#AT_STOP_1449
+#AT_START_1450
+at_fn_group_banner 1450 'ovsdb-server.at:959' \
   "insert default row, query table" "                " 86
 at_xfail=no
 (
-  $as_echo "1447. $at_setup_line: testing $at_desc ..."
+  $as_echo "1450. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -202251,7 +202993,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:959: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:959"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202264,7 +203006,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:959: ovsdb-server --log-file --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:959"
 ( $at_check_trace; ovsdb-server --log-file --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202284,7 +203026,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202307,7 +203049,7 @@
       {"op": "select",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202325,7 +203067,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:959: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:959"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202345,7 +203087,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:959: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:959"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202362,7 +203104,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202378,13 +203120,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1447
-#AT_START_1448
-at_fn_group_banner 1448 'ovsdb-server.at:996' \
+#AT_STOP_1450
+#AT_START_1451
+at_fn_group_banner 1451 'ovsdb-server.at:996' \
   "insert default row, query table" "                " 87
 at_xfail=no
 (
-  $as_echo "1448. $at_setup_line: testing $at_desc ..."
+  $as_echo "1451. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -202397,7 +203139,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202417,7 +203159,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202438,7 +203180,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202453,7 +203195,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202469,13 +203211,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1448
-#AT_START_1449
-at_fn_group_banner 1449 'ovsdb-server.at:996' \
+#AT_STOP_1451
+#AT_START_1452
+at_fn_group_banner 1452 'ovsdb-server.at:996' \
   "insert row, query table" "                        " 87
 at_xfail=no
 (
-  $as_echo "1449. $at_setup_line: testing $at_desc ..."
+  $as_echo "1452. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -202488,7 +203230,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202508,7 +203250,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202529,7 +203271,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202544,7 +203286,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202560,13 +203302,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1449
-#AT_START_1450
-at_fn_group_banner 1450 'ovsdb-server.at:996' \
+#AT_STOP_1452
+#AT_START_1453
+at_fn_group_banner 1453 'ovsdb-server.at:996' \
   "insert rows, query by value" "                    " 87
 at_xfail=no
 (
-  $as_echo "1450. $at_setup_line: testing $at_desc ..."
+  $as_echo "1453. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -202579,7 +203321,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202599,7 +203341,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202620,7 +203362,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202641,7 +203383,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202662,7 +203404,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202677,7 +203419,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202695,13 +203437,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1450
-#AT_START_1451
-at_fn_group_banner 1451 'ovsdb-server.at:996' \
+#AT_STOP_1453
+#AT_START_1454
+at_fn_group_banner 1454 'ovsdb-server.at:996' \
   "insert rows, query by named-uuid" "               " 87
 at_xfail=no
 (
-  $as_echo "1451. $at_setup_line: testing $at_desc ..."
+  $as_echo "1454. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -202714,7 +203456,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202745,7 +203487,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202760,7 +203502,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202775,13 +203517,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1451
-#AT_START_1452
-at_fn_group_banner 1452 'ovsdb-server.at:996' \
+#AT_STOP_1454
+#AT_START_1455
+at_fn_group_banner 1455 'ovsdb-server.at:996' \
   "insert rows, update rows by value" "              " 87
 at_xfail=no
 (
-  $as_echo "1452. $at_setup_line: testing $at_desc ..."
+  $as_echo "1455. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -202794,7 +203536,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202815,7 +203557,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202837,7 +203579,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202859,7 +203601,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202881,7 +203623,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202896,7 +203638,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202914,13 +203656,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1452
-#AT_START_1453
-at_fn_group_banner 1453 'ovsdb-server.at:996' \
+#AT_STOP_1455
+#AT_START_1456
+at_fn_group_banner 1456 'ovsdb-server.at:996' \
   "insert rows, mutate rows" "                       " 87
 at_xfail=no
 (
-  $as_echo "1453. $at_setup_line: testing $at_desc ..."
+  $as_echo "1456. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -202933,7 +203675,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202954,7 +203696,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202976,7 +203718,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -202998,7 +203740,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203020,7 +203762,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203035,7 +203777,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203053,13 +203795,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1453
-#AT_START_1454
-at_fn_group_banner 1454 'ovsdb-server.at:996' \
+#AT_STOP_1456
+#AT_START_1457
+at_fn_group_banner 1457 'ovsdb-server.at:996' \
   "insert rows, delete by named-uuid" "              " 87
 at_xfail=no
 (
-  $as_echo "1454. $at_setup_line: testing $at_desc ..."
+  $as_echo "1457. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -203072,7 +203814,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203104,7 +203846,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203119,7 +203861,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203134,13 +203876,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1454
-#AT_START_1455
-at_fn_group_banner 1455 'ovsdb-server.at:996' \
+#AT_STOP_1457
+#AT_START_1458
+at_fn_group_banner 1458 'ovsdb-server.at:996' \
   "insert rows, delete rows by value" "              " 87
 at_xfail=no
 (
-  $as_echo "1455. $at_setup_line: testing $at_desc ..."
+  $as_echo "1458. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -203153,7 +203895,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203174,7 +203916,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203196,7 +203938,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203217,7 +203959,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203238,7 +203980,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203253,7 +203995,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203271,13 +204013,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1455
-#AT_START_1456
-at_fn_group_banner 1456 'ovsdb-server.at:996' \
+#AT_STOP_1458
+#AT_START_1459
+at_fn_group_banner 1459 'ovsdb-server.at:996' \
   "insert rows, delete by (non-matching) value" "    " 87
 at_xfail=no
 (
-  $as_echo "1456. $at_setup_line: testing $at_desc ..."
+  $as_echo "1459. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -203290,7 +204032,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203311,7 +204053,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203333,7 +204075,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203354,7 +204096,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203376,7 +204118,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203391,7 +204133,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203409,13 +204151,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1456
-#AT_START_1457
-at_fn_group_banner 1457 'ovsdb-server.at:996' \
+#AT_STOP_1459
+#AT_START_1460
+at_fn_group_banner 1460 'ovsdb-server.at:996' \
   "insert rows, delete all" "                        " 87
 at_xfail=no
 (
-  $as_echo "1457. $at_setup_line: testing $at_desc ..."
+  $as_echo "1460. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -203428,7 +204170,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203460,7 +204202,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203475,7 +204217,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203490,13 +204232,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1457
-#AT_START_1458
-at_fn_group_banner 1458 'ovsdb-server.at:996' \
+#AT_STOP_1460
+#AT_START_1461
+at_fn_group_banner 1461 'ovsdb-server.at:996' \
   "insert row, query table, commit" "                " 87
 at_xfail=no
 (
-  $as_echo "1458. $at_setup_line: testing $at_desc ..."
+  $as_echo "1461. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -203509,7 +204251,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203534,7 +204276,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203549,7 +204291,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203564,13 +204306,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1458
-#AT_START_1459
-at_fn_group_banner 1459 'ovsdb-server.at:996' \
+#AT_STOP_1461
+#AT_START_1462
+at_fn_group_banner 1462 'ovsdb-server.at:996' \
   "insert row, query table, commit durably" "        " 87
 at_xfail=no
 (
-  $as_echo "1459. $at_setup_line: testing $at_desc ..."
+  $as_echo "1462. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -203583,7 +204325,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203608,7 +204350,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203623,7 +204365,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203638,13 +204380,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1459
-#AT_START_1460
-at_fn_group_banner 1460 'ovsdb-server.at:996' \
+#AT_STOP_1462
+#AT_START_1463
+at_fn_group_banner 1463 'ovsdb-server.at:996' \
   "equality wait with correct rows" "                " 87
 at_xfail=no
 (
-  $as_echo "1460. $at_setup_line: testing $at_desc ..."
+  $as_echo "1463. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -203657,7 +204399,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203688,7 +204430,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203703,7 +204445,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203718,13 +204460,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1460
-#AT_START_1461
-at_fn_group_banner 1461 'ovsdb-server.at:996' \
+#AT_STOP_1463
+#AT_START_1464
+at_fn_group_banner 1464 'ovsdb-server.at:996' \
   "equality wait with extra row" "                   " 87
 at_xfail=no
 (
-  $as_echo "1461. $at_setup_line: testing $at_desc ..."
+  $as_echo "1464. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -203737,7 +204479,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203769,7 +204511,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203784,7 +204526,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203799,13 +204541,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1461
-#AT_START_1462
-at_fn_group_banner 1462 'ovsdb-server.at:996' \
+#AT_STOP_1464
+#AT_START_1465
+at_fn_group_banner 1465 'ovsdb-server.at:996' \
   "equality wait with missing row" "                 " 87
 at_xfail=no
 (
-  $as_echo "1462. $at_setup_line: testing $at_desc ..."
+  $as_echo "1465. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -203818,7 +204560,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203848,7 +204590,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203863,7 +204605,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203878,13 +204620,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1462
-#AT_START_1463
-at_fn_group_banner 1463 'ovsdb-server.at:996' \
+#AT_STOP_1465
+#AT_START_1466
+at_fn_group_banner 1466 'ovsdb-server.at:996' \
   "inequality wait with correct rows" "              " 87
 at_xfail=no
 (
-  $as_echo "1463. $at_setup_line: testing $at_desc ..."
+  $as_echo "1466. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -203897,7 +204639,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203928,7 +204670,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203943,7 +204685,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -203958,13 +204700,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1463
-#AT_START_1464
-at_fn_group_banner 1464 'ovsdb-server.at:996' \
+#AT_STOP_1466
+#AT_START_1467
+at_fn_group_banner 1467 'ovsdb-server.at:996' \
   "inequality wait with extra row" "                 " 87
 at_xfail=no
 (
-  $as_echo "1464. $at_setup_line: testing $at_desc ..."
+  $as_echo "1467. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -203977,7 +204719,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204009,7 +204751,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204024,7 +204766,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204039,13 +204781,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1464
-#AT_START_1465
-at_fn_group_banner 1465 'ovsdb-server.at:996' \
+#AT_STOP_1467
+#AT_START_1468
+at_fn_group_banner 1468 'ovsdb-server.at:996' \
   "inequality wait with missing row" "               " 87
 at_xfail=no
 (
-  $as_echo "1465. $at_setup_line: testing $at_desc ..."
+  $as_echo "1468. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -204058,7 +204800,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204088,7 +204830,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204103,7 +204845,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204118,13 +204860,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1465
-#AT_START_1466
-at_fn_group_banner 1466 'ovsdb-server.at:996' \
+#AT_STOP_1468
+#AT_START_1469
+at_fn_group_banner 1469 'ovsdb-server.at:996' \
   "insert and update constraints" "                  " 87
 at_xfail=no
 (
-  $as_echo "1466. $at_setup_line: testing $at_desc ..."
+  $as_echo "1469. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -204137,7 +204879,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204157,7 +204899,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204178,7 +204920,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204200,7 +204942,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204221,7 +204963,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204242,7 +204984,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204257,7 +204999,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204276,13 +205018,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1466
-#AT_START_1467
-at_fn_group_banner 1467 'ovsdb-server.at:996' \
+#AT_STOP_1469
+#AT_START_1470
+at_fn_group_banner 1470 'ovsdb-server.at:996' \
   "index uniqueness checking" "                      " 87
 at_xfail=no
 (
-  $as_echo "1467. $at_setup_line: testing $at_desc ..."
+  $as_echo "1470. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -204295,7 +205037,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204315,7 +205057,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204336,7 +205078,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204360,7 +205102,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204387,7 +205129,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204408,7 +205150,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204430,7 +205172,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204456,7 +205198,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204489,7 +205231,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204504,7 +205246,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204526,13 +205268,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1467
-#AT_START_1468
-at_fn_group_banner 1468 'ovsdb-server.at:996' \
+#AT_STOP_1470
+#AT_START_1471
+at_fn_group_banner 1471 'ovsdb-server.at:996' \
   "referential integrity -- simple" "                " 87
 at_xfail=no
 (
-  $as_echo "1468. $at_setup_line: testing $at_desc ..."
+  $as_echo "1471. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -204545,7 +205287,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204578,7 +205320,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204599,7 +205341,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204621,7 +205363,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204642,7 +205384,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204663,7 +205405,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204684,7 +205426,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204705,7 +205447,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204726,7 +205468,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204747,7 +205489,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204762,7 +205504,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204785,13 +205527,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1468
-#AT_START_1469
-at_fn_group_banner 1469 'ovsdb-server.at:996' \
+#AT_STOP_1471
+#AT_START_1472
+at_fn_group_banner 1472 'ovsdb-server.at:996' \
   "referential integrity -- mutual references" "     " 87
 at_xfail=no
 (
-  $as_echo "1469. $at_setup_line: testing $at_desc ..."
+  $as_echo "1472. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -204804,7 +205546,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204833,7 +205575,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204854,7 +205596,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204875,7 +205617,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204896,7 +205638,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204917,7 +205659,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204938,7 +205680,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204962,7 +205704,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204977,7 +205719,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -204998,13 +205740,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1469
-#AT_START_1470
-at_fn_group_banner 1470 'ovsdb-server.at:996' \
+#AT_STOP_1472
+#AT_START_1473
+at_fn_group_banner 1473 'ovsdb-server.at:996' \
   "weak references" "                                " 87
 at_xfail=no
 (
-  $as_echo "1470. $at_setup_line: testing $at_desc ..."
+  $as_echo "1473. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -205017,7 +205759,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205068,7 +205810,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205091,7 +205833,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205114,7 +205856,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205136,7 +205878,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205157,7 +205899,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205178,7 +205920,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205199,7 +205941,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205222,7 +205964,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205245,7 +205987,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205266,7 +206008,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205289,7 +206031,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205312,7 +206054,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205333,7 +206075,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205356,7 +206098,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205379,7 +206121,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205394,7 +206136,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205423,13 +206165,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1470
-#AT_START_1471
-at_fn_group_banner 1471 'ovsdb-server.at:996' \
+#AT_STOP_1473
+#AT_START_1474
+at_fn_group_banner 1474 'ovsdb-server.at:996' \
   "immutable columns" "                              " 87
 at_xfail=no
 (
-  $as_echo "1471. $at_setup_line: testing $at_desc ..."
+  $as_echo "1474. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -205442,7 +206184,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205463,7 +206205,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205485,7 +206227,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205507,7 +206249,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205529,7 +206271,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205551,7 +206293,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205566,7 +206308,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205585,13 +206327,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1471
-#AT_START_1472
-at_fn_group_banner 1472 'ovsdb-server.at:996' \
+#AT_STOP_1474
+#AT_START_1475
+at_fn_group_banner 1475 'ovsdb-server.at:996' \
   "garbage collection" "                             " 87
 at_xfail=no
 (
-  $as_echo "1472. $at_setup_line: testing $at_desc ..."
+  $as_echo "1475. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-server.at:996" >"$at_check_line_file"
@@ -205604,7 +206346,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205624,7 +206366,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205646,7 +206388,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205680,7 +206422,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205702,7 +206444,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205728,7 +206470,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205751,7 +206493,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205773,7 +206515,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205795,7 +206537,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205821,7 +206563,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205843,7 +206585,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205877,7 +206619,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205900,7 +206642,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205922,7 +206664,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205944,7 +206686,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205966,7 +206708,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -205988,7 +206730,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: ovsdb-server --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db --run=\"sh txnfile\""
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-server.at:996"
 ( $at_check_trace; ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206003,7 +206745,7 @@
 $as_echo "$at_srcdir/ovsdb-server.at:996: \${PERL} \$srcdir/uuidfilt.pl output"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-server.at:996"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206033,13 +206775,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1472
-#AT_START_1473
-at_fn_group_banner 1473 'ovsdb-monitor.at:48' \
+#AT_STOP_1475
+#AT_START_1476
+at_fn_group_banner 1476 'ovsdb-monitor.at:48' \
   "monitor insert into empty table" "                " 88
 at_xfail=no
 (
-  $as_echo "1473. $at_setup_line: testing $at_desc ..."
+  $as_echo "1476. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -206049,7 +206791,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:48: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:48"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206064,7 +206806,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:48: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:48"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -206079,7 +206821,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:48: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:48"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206098,7 +206840,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:48: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:48"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206122,7 +206864,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206139,7 +206881,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:48: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:48"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206156,7 +206898,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:48: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:48"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206174,7 +206916,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206188,7 +206930,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:48: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:48"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206205,13 +206947,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1473
-#AT_START_1474
-at_fn_group_banner 1474 'ovsdb-monitor.at:60' \
+#AT_STOP_1476
+#AT_START_1477
+at_fn_group_banner 1477 'ovsdb-monitor.at:60' \
   "monitor insert into populated table" "            " 88
 at_xfail=no
 (
-  $as_echo "1474. $at_setup_line: testing $at_desc ..."
+  $as_echo "1477. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -206221,7 +206963,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:60: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:60"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206240,7 +206982,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206254,7 +206996,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:60: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:60"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -206269,7 +207011,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:60: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:60"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206288,7 +207030,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:60: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:60"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206312,7 +207054,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206329,7 +207071,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:60: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:60"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206346,7 +207088,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:60: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:60"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206364,7 +207106,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206378,7 +207120,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:60: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:60"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206398,13 +207140,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1474
-#AT_START_1475
-at_fn_group_banner 1475 'ovsdb-monitor.at:78' \
+#AT_STOP_1477
+#AT_START_1478
+at_fn_group_banner 1478 'ovsdb-monitor.at:78' \
   "monitor delete" "                                 " 88
 at_xfail=no
 (
-  $as_echo "1475. $at_setup_line: testing $at_desc ..."
+  $as_echo "1478. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -206414,7 +207156,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:78: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:78"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206433,7 +207175,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206447,7 +207189,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:78: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:78"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -206462,7 +207204,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:78: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:78"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206481,7 +207223,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:78: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:78"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206505,7 +207247,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": [["number", "==", 10]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206522,7 +207264,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:78: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:78"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206539,7 +207281,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:78: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:78"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206557,7 +207299,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206571,7 +207313,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:78: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:78"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206591,13 +207333,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1475
-#AT_START_1476
-at_fn_group_banner 1476 'ovsdb-monitor.at:96' \
+#AT_STOP_1478
+#AT_START_1479
+at_fn_group_banner 1479 'ovsdb-monitor.at:96' \
   "monitor row update" "                             " 88
 at_xfail=no
 (
-  $as_echo "1476. $at_setup_line: testing $at_desc ..."
+  $as_echo "1479. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -206607,7 +207349,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:96: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:96"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206626,7 +207368,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206640,7 +207382,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:96: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:96"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -206655,7 +207397,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:96: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:96"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206674,7 +207416,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:96: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:96"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206700,7 +207442,7 @@
        "table": "ordinals",
        "where": [["number", "==", 10]],
        "row": {"name": "five plus five"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206717,7 +207459,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:96: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:96"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206734,7 +207476,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:96: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:96"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206752,7 +207494,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206766,7 +207508,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:96: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:96"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206787,13 +207529,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1476
-#AT_START_1477
-at_fn_group_banner 1477 'ovsdb-monitor.at:116' \
+#AT_STOP_1479
+#AT_START_1480
+at_fn_group_banner 1480 'ovsdb-monitor.at:116' \
   "monitor no-op row updates" "                      " 88
 at_xfail=no
 (
-  $as_echo "1477. $at_setup_line: testing $at_desc ..."
+  $as_echo "1480. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -206803,7 +207545,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:116: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:116"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206822,7 +207564,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206836,7 +207578,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:116: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:116"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -206851,7 +207593,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:116: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:116"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206870,7 +207612,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:116: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:116"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206896,7 +207638,7 @@
        "table": "ordinals",
        "where": [["number", "==", 10]],
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206918,7 +207660,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 9, "name": "nine"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206935,7 +207677,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:116: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:116"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206952,7 +207694,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:116: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:116"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206970,7 +207712,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -206984,7 +207726,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:116: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:116"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207004,13 +207746,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1477
-#AT_START_1478
-at_fn_group_banner 1478 'ovsdb-monitor.at:139' \
+#AT_STOP_1480
+#AT_START_1481
+at_fn_group_banner 1481 'ovsdb-monitor.at:139' \
   "monitor insert-and-update transaction" "          " 88
 at_xfail=no
 (
-  $as_echo "1478. $at_setup_line: testing $at_desc ..."
+  $as_echo "1481. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -207020,7 +207762,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:139: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:139"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207039,7 +207781,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207053,7 +207795,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:139: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:139"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -207068,7 +207810,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:139: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:139"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207087,7 +207829,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:139: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:139"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207121,7 +207863,7 @@
        "table": "ordinals",
        "where": [["_uuid", "==", ["named-uuid", "nine"]]],
        "row": {"name": "three squared"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207138,7 +207880,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:139: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:139"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207155,7 +207897,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:139: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:139"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207173,7 +207915,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207187,7 +207929,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:139: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:139"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207207,13 +207949,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1478
-#AT_START_1479
-at_fn_group_banner 1479 'ovsdb-monitor.at:162' \
+#AT_STOP_1481
+#AT_START_1482
+at_fn_group_banner 1482 'ovsdb-monitor.at:162' \
   "monitor insert-update-and-delete transaction" "   " 88
 at_xfail=no
 (
-  $as_echo "1479. $at_setup_line: testing $at_desc ..."
+  $as_echo "1482. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -207223,7 +207965,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:162: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:162"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207242,7 +207984,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207256,7 +207998,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:162: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:162"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -207271,7 +208013,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:162: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:162"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207290,7 +208032,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:162: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:162"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207336,7 +208078,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 7, "name": "seven"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207353,7 +208095,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:162: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:162"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207370,7 +208112,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:162: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:162"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207388,7 +208130,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207402,7 +208144,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:162: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:162"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207422,13 +208164,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1479
-#AT_START_1480
-at_fn_group_banner 1480 'ovsdb-monitor.at:191' \
+#AT_STOP_1482
+#AT_START_1483
+at_fn_group_banner 1483 'ovsdb-monitor.at:191' \
   "monitor weak reference change" "                  " 88
 at_xfail=no
 (
-  $as_echo "1480. $at_setup_line: testing $at_desc ..."
+  $as_echo "1483. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -207438,7 +208180,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:191: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:191"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207485,7 +208227,7 @@
        "table": "b",
        "row": {"b": 2},
        "uuid-name": "b2"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207499,7 +208241,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:191: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:191"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -207514,7 +208256,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:191: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket weak a  > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:191"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket weak a  > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207533,7 +208275,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:191: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket weak a  > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:191"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket weak a  > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207557,7 +208299,7 @@
       {"op": "delete",
        "table": "a",
        "where": [["a", "==", 0]]}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207574,7 +208316,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:191: ovsdb-client transact unix:socket '[\"weak\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:191"
 ( $at_check_trace; ovsdb-client transact unix:socket '["weak"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207591,7 +208333,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:191: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:191"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207609,7 +208351,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207623,7 +208365,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:191: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:191"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207646,13 +208388,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1480
-#AT_START_1481
-at_fn_group_banner 1481 'ovsdb-monitor.at:226' \
+#AT_STOP_1483
+#AT_START_1484
+at_fn_group_banner 1484 'ovsdb-monitor.at:226' \
   "monitor insert-update-and-delete transaction" "   " 88
 at_xfail=no
 (
-  $as_echo "1481. $at_setup_line: testing $at_desc ..."
+  $as_echo "1484. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -207662,7 +208404,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:226: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:226"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207681,7 +208423,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207695,7 +208437,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:226: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:226"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -207710,7 +208452,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:226: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:226"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207729,7 +208471,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:226: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:226"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207775,7 +208517,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 7, "name": "seven"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207792,7 +208534,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:226: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:226"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207809,7 +208551,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:226: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:226"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207827,7 +208569,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207841,7 +208583,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:226: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:226"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207861,13 +208603,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1481
-#AT_START_1482
-at_fn_group_banner 1482 'ovsdb-monitor.at:277' \
+#AT_STOP_1484
+#AT_START_1485
+at_fn_group_banner 1485 'ovsdb-monitor.at:277' \
   "monitor all operations" "                         " 89
 at_xfail=no
 (
-  $as_echo "1482. $at_setup_line: testing $at_desc ..."
+  $as_echo "1485. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -207877,7 +208619,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:277: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:277"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207896,7 +208638,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207910,7 +208652,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:277: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:277"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -207925,7 +208667,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:277: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:277"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207944,7 +208686,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:277: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:277"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals  > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207968,7 +208710,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 5, "name": "five"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -207992,7 +208734,7 @@
        "table": "ordinals",
        "where": [["name", "==", "five"]],
        "row": {"name": "FIVE"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208014,7 +208756,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208031,7 +208773,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:277: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:277"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208048,7 +208790,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:277: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:277"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208066,7 +208808,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208080,7 +208822,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:277: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:277"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208108,13 +208850,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1482
-#AT_START_1483
-at_fn_group_banner 1483 'ovsdb-monitor.at:297' \
+#AT_STOP_1485
+#AT_START_1486
+at_fn_group_banner 1486 'ovsdb-monitor.at:297' \
   "monitor initial only" "                           " 89
 at_xfail=no
 (
-  $as_echo "1483. $at_setup_line: testing $at_desc ..."
+  $as_echo "1486. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -208124,7 +208866,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:297: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:297"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208143,7 +208885,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208157,7 +208899,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:297: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:297"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -208172,7 +208914,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:297: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !insert,!delete,!modify > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:297"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !insert,!delete,!modify > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208191,7 +208933,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:297: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !insert,!delete,!modify > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:297"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !insert,!delete,!modify > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208215,7 +208957,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 5, "name": "five"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208239,7 +208981,7 @@
        "table": "ordinals",
        "where": [["name", "==", "five"]],
        "row": {"name": "FIVE"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208261,7 +209003,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208278,7 +209020,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:297: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:297"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208295,7 +209037,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:297: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:297"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208313,7 +209055,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208327,7 +209069,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:297: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:297"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208344,13 +209086,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1483
-#AT_START_1484
-at_fn_group_banner 1484 'ovsdb-monitor.at:304' \
+#AT_STOP_1486
+#AT_START_1487
+at_fn_group_banner 1487 'ovsdb-monitor.at:304' \
   "monitor insert only" "                            " 89
 at_xfail=no
 (
-  $as_echo "1484. $at_setup_line: testing $at_desc ..."
+  $as_echo "1487. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -208360,7 +209102,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:304: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:304"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208379,7 +209121,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208393,7 +209135,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:304: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:304"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -208408,7 +209150,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:304: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !initial,!delete,!modify > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:304"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !initial,!delete,!modify > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208427,7 +209169,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:304: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !initial,!delete,!modify > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:304"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !initial,!delete,!modify > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208451,7 +209193,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 5, "name": "five"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208475,7 +209217,7 @@
        "table": "ordinals",
        "where": [["name", "==", "five"]],
        "row": {"name": "FIVE"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208497,7 +209239,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208514,7 +209256,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:304: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:304"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208531,7 +209273,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:304: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:304"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208549,7 +209291,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208563,7 +209305,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:304: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:304"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208580,13 +209322,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1484
-#AT_START_1485
-at_fn_group_banner 1485 'ovsdb-monitor.at:311' \
+#AT_STOP_1487
+#AT_START_1488
+at_fn_group_banner 1488 'ovsdb-monitor.at:311' \
   "monitor delete only" "                            " 89
 at_xfail=no
 (
-  $as_echo "1485. $at_setup_line: testing $at_desc ..."
+  $as_echo "1488. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -208596,7 +209338,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:311: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:311"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208615,7 +209357,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208629,7 +209371,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:311: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:311"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -208644,7 +209386,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:311: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !initial,!insert,!modify > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:311"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !initial,!insert,!modify > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208663,7 +209405,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:311: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !initial,!insert,!modify > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:311"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !initial,!insert,!modify > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208687,7 +209429,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 5, "name": "five"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208711,7 +209453,7 @@
        "table": "ordinals",
        "where": [["name", "==", "five"]],
        "row": {"name": "FIVE"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208733,7 +209475,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208750,7 +209492,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:311: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:311"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208767,7 +209509,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:311: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:311"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208785,7 +209527,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208799,7 +209541,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:311: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:311"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208817,13 +209559,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1485
-#AT_START_1486
-at_fn_group_banner 1486 'ovsdb-monitor.at:319' \
+#AT_STOP_1488
+#AT_START_1489
+at_fn_group_banner 1489 'ovsdb-monitor.at:319' \
   "monitor modify only" "                            " 89
 at_xfail=no
 (
-  $as_echo "1486. $at_setup_line: testing $at_desc ..."
+  $as_echo "1489. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -208833,7 +209575,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:319: ovsdb-tool create db schema"
 at_fn_check_prepare_trace "ovsdb-monitor.at:319"
 ( $at_check_trace; ovsdb-tool create db schema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208852,7 +209594,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208866,7 +209608,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:319: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/server-pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl --log-file=\"\`pwd\`\"/ovsdb-server-log db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:319"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -208881,7 +209623,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:319: ovsdb-client -vjsonrpc --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !initial,!insert,!delete > output &"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:319"
 ( $at_check_trace; ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !initial,!insert,!delete > output &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208900,7 +209642,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:319: ovsdb-client -vjsonrpc --detach --no-chdir --pidfile=\"\`pwd\`\"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !initial,!insert,!delete > output"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:319"
 ( $at_check_trace; ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket ordinals ordinals !initial,!insert,!delete > output
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208924,7 +209666,7 @@
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 5, "name": "five"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208948,7 +209690,7 @@
        "table": "ordinals",
        "where": [["name", "==", "five"]],
        "row": {"name": "FIVE"}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208970,7 +209712,7 @@
       {"op": "delete",
        "table": "ordinals",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -208987,7 +209729,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:319: ovsdb-client transact unix:socket '[\"ordinals\"]'"
 at_fn_check_prepare_trace "ovsdb-monitor.at:319"
 ( $at_check_trace; ovsdb-client transact unix:socket '["ordinals"]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209004,7 +209746,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:319: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-monitor.at:319"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209022,7 +209764,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -e server-pid && test ! -e client-pid
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209036,7 +209778,7 @@
 $as_echo "$at_srcdir/ovsdb-monitor.at:319: \${PERL} \$srcdir/ovsdb-monitor-sort.pl < output | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-monitor.at:319"
 ( $at_check_trace; ${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209054,13 +209796,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1486
-#AT_START_1487
-at_fn_group_banner 1487 'ovsdb-idl.at:103' \
+#AT_STOP_1489
+#AT_START_1490
+at_fn_group_banner 1490 'ovsdb-idl.at:103' \
   "simple idl, initially empty, no ops - C" "        " 90
 at_xfail=no
 (
-  $as_echo "1487. $at_setup_line: testing $at_desc ..."
+  $as_echo "1490. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -209069,7 +209811,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:103"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209082,7 +209824,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:103"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209096,7 +209838,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket "
 at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:103"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209112,7 +209854,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:103"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -209132,7 +209874,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:103"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209149,7 +209891,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209165,13 +209907,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1487
-#AT_START_1488
-at_fn_group_banner 1488 'ovsdb-idl.at:103' \
+#AT_STOP_1490
+#AT_START_1491
+at_fn_group_banner 1491 'ovsdb-idl.at:103' \
   "simple idl, initially empty, no ops - Python" "   " 90
 at_xfail=no
 (
-  $as_echo "1488. $at_setup_line: testing $at_desc ..."
+  $as_echo "1491. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:103" >"$at_check_line_file"
@@ -209183,7 +209925,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:103"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209196,7 +209938,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:103"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209210,7 +209952,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: \$PYTHON \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket " "ovsdb-idl.at:103"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209226,7 +209968,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:103"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -209246,7 +209988,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:103"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209263,7 +210005,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209279,13 +210021,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1488
-#AT_START_1489
-at_fn_group_banner 1489 'ovsdb-idl.at:103' \
+#AT_STOP_1491
+#AT_START_1492
+at_fn_group_banner 1492 'ovsdb-idl.at:103' \
   "simple idl, initially empty, no ops - Python tcp" "" 90
 at_xfail=no
 (
-  $as_echo "1489. $at_setup_line: testing $at_desc ..."
+  $as_echo "1492. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:103" >"$at_check_line_file"
@@ -209298,7 +210040,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:103"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209311,7 +210053,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:103"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209327,7 +210069,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: \$PYTHON \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT " "ovsdb-idl.at:103"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209343,7 +210085,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:103"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -209363,7 +210105,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:103"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209380,7 +210122,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209396,13 +210138,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1489
-#AT_START_1490
-at_fn_group_banner 1490 'ovsdb-idl.at:103' \
+#AT_STOP_1492
+#AT_START_1493
+at_fn_group_banner 1493 'ovsdb-idl.at:103' \
   "simple idl, initially empty, no ops - Python tcp6" "" 90
 at_xfail=no
 (
-  $as_echo "1490. $at_setup_line: testing $at_desc ..."
+  $as_echo "1493. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:103" >"$at_check_line_file"
@@ -209415,7 +210157,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:103"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209428,7 +210170,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:103"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209445,7 +210187,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: \$PYTHON \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT "
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT " "ovsdb-idl.at:103"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209461,7 +210203,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:103"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -209481,7 +210223,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:103: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:103"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209498,7 +210240,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209514,13 +210256,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1490
-#AT_START_1491
-at_fn_group_banner 1491 'ovsdb-idl.at:110' \
+#AT_STOP_1493
+#AT_START_1494
+at_fn_group_banner 1494 'ovsdb-idl.at:110' \
   "simple idl, initially empty, various ops - C" "   " 90
 at_xfail=no
 (
-  $as_echo "1491. $at_setup_line: testing $at_desc ..."
+  $as_echo "1494. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -209529,7 +210271,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:110"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209542,7 +210284,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:110"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209652,7 +210394,7 @@
        "table": "simple",
        "where": [["i", "==", 0]]}]' \
     'reconnect'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209668,7 +210410,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:110"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -209711,7 +210453,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:110"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209728,7 +210470,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209744,13 +210486,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1491
-#AT_START_1492
-at_fn_group_banner 1492 'ovsdb-idl.at:110' \
+#AT_STOP_1494
+#AT_START_1495
+at_fn_group_banner 1495 'ovsdb-idl.at:110' \
   "simple idl, initially empty, various ops - Python" "" 90
 at_xfail=no
 (
-  $as_echo "1492. $at_setup_line: testing $at_desc ..."
+  $as_echo "1495. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:110" >"$at_check_line_file"
@@ -209762,7 +210504,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:110"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209775,7 +210517,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:110"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209885,7 +210627,7 @@
        "table": "simple",
        "where": [["i", "==", 0]]}]' \
     'reconnect'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209901,7 +210643,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:110"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -209944,7 +210686,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:110"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209961,7 +210703,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -209977,13 +210719,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1492
-#AT_START_1493
-at_fn_group_banner 1493 'ovsdb-idl.at:110' \
+#AT_STOP_1495
+#AT_START_1496
+at_fn_group_banner 1496 'ovsdb-idl.at:110' \
   "simple idl, initially empty, various ops - Python tcp" "" 90
 at_xfail=no
 (
-  $as_echo "1493. $at_setup_line: testing $at_desc ..."
+  $as_echo "1496. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:110" >"$at_check_line_file"
@@ -209996,7 +210738,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:110"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210009,7 +210751,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:110"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210121,7 +210863,7 @@
        "table": "simple",
        "where": [["i", "==", 0]]}]' \
     'reconnect'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210137,7 +210879,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:110"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -210180,7 +210922,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:110"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210197,7 +210939,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210213,13 +210955,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1493
-#AT_START_1494
-at_fn_group_banner 1494 'ovsdb-idl.at:110' \
+#AT_STOP_1496
+#AT_START_1497
+at_fn_group_banner 1497 'ovsdb-idl.at:110' \
   "simple idl, initially empty, various ops - Python tcp6" "" 90
 at_xfail=no
 (
-  $as_echo "1494. $at_setup_line: testing $at_desc ..."
+  $as_echo "1497. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:110" >"$at_check_line_file"
@@ -210232,7 +210974,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:110"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210245,7 +210987,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:110"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210358,7 +211100,7 @@
        "table": "simple",
        "where": [["i", "==", 0]]}]' \
     'reconnect'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210374,7 +211116,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:110"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -210417,7 +211159,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:110: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:110"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210434,7 +211176,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210450,13 +211192,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1494
-#AT_START_1495
-at_fn_group_banner 1495 'ovsdb-idl.at:188' \
+#AT_STOP_1497
+#AT_START_1498
+at_fn_group_banner 1498 'ovsdb-idl.at:188' \
   "simple idl, initially populated - C" "            " 90
 at_xfail=no
 (
-  $as_echo "1495. $at_setup_line: testing $at_desc ..."
+  $as_echo "1498. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -210465,7 +211207,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:188"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210478,7 +211220,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:188"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210523,7 +211265,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210547,7 +211289,7 @@
        "table": "simple",
        "where": [],
        "row": {"b": true}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210563,7 +211305,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:188"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -210587,7 +211329,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:188"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210604,7 +211346,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210620,13 +211362,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1495
-#AT_START_1496
-at_fn_group_banner 1496 'ovsdb-idl.at:188' \
+#AT_STOP_1498
+#AT_START_1499
+at_fn_group_banner 1499 'ovsdb-idl.at:188' \
   "simple idl, initially populated - Python" "       " 90
 at_xfail=no
 (
-  $as_echo "1496. $at_setup_line: testing $at_desc ..."
+  $as_echo "1499. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:188" >"$at_check_line_file"
@@ -210638,7 +211380,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:188"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210651,7 +211393,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:188"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210696,7 +211438,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210720,7 +211462,7 @@
        "table": "simple",
        "where": [],
        "row": {"b": true}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210736,7 +211478,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:188"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -210760,7 +211502,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:188"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210777,7 +211519,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210793,13 +211535,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1496
-#AT_START_1497
-at_fn_group_banner 1497 'ovsdb-idl.at:188' \
+#AT_STOP_1499
+#AT_START_1500
+at_fn_group_banner 1500 'ovsdb-idl.at:188' \
   "simple idl, initially populated - Python tcp" "   " 90
 at_xfail=no
 (
-  $as_echo "1497. $at_setup_line: testing $at_desc ..."
+  $as_echo "1500. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:188" >"$at_check_line_file"
@@ -210812,7 +211554,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:188"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210825,7 +211567,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:188"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210872,7 +211614,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210896,7 +211638,7 @@
        "table": "simple",
        "where": [],
        "row": {"b": true}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210912,7 +211654,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:188"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -210936,7 +211678,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:188"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210953,7 +211695,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -210969,13 +211711,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1497
-#AT_START_1498
-at_fn_group_banner 1498 'ovsdb-idl.at:188' \
+#AT_STOP_1500
+#AT_START_1501
+at_fn_group_banner 1501 'ovsdb-idl.at:188' \
   "simple idl, initially populated - Python tcp6" "  " 90
 at_xfail=no
 (
-  $as_echo "1498. $at_setup_line: testing $at_desc ..."
+  $as_echo "1501. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:188" >"$at_check_line_file"
@@ -210988,7 +211730,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:188"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211001,7 +211743,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:188"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211049,7 +211791,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211073,7 +211815,7 @@
        "table": "simple",
        "where": [],
        "row": {"b": true}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211089,7 +211831,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:188"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -211113,7 +211855,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:188: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:188"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211130,7 +211872,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211146,13 +211888,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1498
-#AT_START_1499
-at_fn_group_banner 1499 'ovsdb-idl.at:219' \
+#AT_STOP_1501
+#AT_START_1502
+at_fn_group_banner 1502 'ovsdb-idl.at:219' \
   "simple idl, writing via IDL - C" "                " 90
 at_xfail=no
 (
-  $as_echo "1499. $at_setup_line: testing $at_desc ..."
+  $as_echo "1502. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -211161,7 +211903,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:219"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211174,7 +211916,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:219"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211219,7 +211961,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211237,7 +211979,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:219"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211253,7 +211995,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:219"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -211280,7 +212022,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:219"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211297,7 +212039,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211313,13 +212055,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1499
-#AT_START_1500
-at_fn_group_banner 1500 'ovsdb-idl.at:219' \
+#AT_STOP_1502
+#AT_START_1503
+at_fn_group_banner 1503 'ovsdb-idl.at:219' \
   "simple idl, writing via IDL - Python" "           " 90
 at_xfail=no
 (
-  $as_echo "1500. $at_setup_line: testing $at_desc ..."
+  $as_echo "1503. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:219" >"$at_check_line_file"
@@ -211331,7 +212073,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:219"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211344,7 +212086,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:219"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211389,7 +212131,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211407,7 +212149,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:219"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211423,7 +212165,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:219"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -211450,7 +212192,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:219"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211467,7 +212209,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211483,13 +212225,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1500
-#AT_START_1501
-at_fn_group_banner 1501 'ovsdb-idl.at:219' \
+#AT_STOP_1503
+#AT_START_1504
+at_fn_group_banner 1504 'ovsdb-idl.at:219' \
   "simple idl, writing via IDL - Python tcp" "       " 90
 at_xfail=no
 (
-  $as_echo "1501. $at_setup_line: testing $at_desc ..."
+  $as_echo "1504. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:219" >"$at_check_line_file"
@@ -211502,7 +212244,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:219"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211515,7 +212257,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:219"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211562,7 +212304,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211580,7 +212322,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:219"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211596,7 +212338,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:219"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -211623,7 +212365,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:219"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211640,7 +212382,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211656,13 +212398,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1501
-#AT_START_1502
-at_fn_group_banner 1502 'ovsdb-idl.at:219' \
+#AT_STOP_1504
+#AT_START_1505
+at_fn_group_banner 1505 'ovsdb-idl.at:219' \
   "simple idl, writing via IDL - Python tcp6" "      " 90
 at_xfail=no
 (
-  $as_echo "1502. $at_setup_line: testing $at_desc ..."
+  $as_echo "1505. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:219" >"$at_check_line_file"
@@ -211675,7 +212417,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:219"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211688,7 +212430,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:219"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211736,7 +212478,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211754,7 +212496,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:219"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211770,7 +212512,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:219"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -211797,7 +212539,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:219: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:219"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211814,7 +212556,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211830,13 +212572,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1502
-#AT_START_1503
-at_fn_group_banner 1503 'ovsdb-idl.at:250' \
+#AT_STOP_1505
+#AT_START_1506
+at_fn_group_banner 1506 'ovsdb-idl.at:250' \
   "simple idl, handling verification failure - C" "  " 90
 at_xfail=no
 (
-  $as_echo "1503. $at_setup_line: testing $at_desc ..."
+  $as_echo "1506. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -211845,7 +212587,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:250"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211858,7 +212600,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:250"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211885,7 +212627,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211917,7 +212659,7 @@
     '+verify 1 r, set 1 r 3' \
     'verify 1 r, set 1 r 3' \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211933,7 +212675,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:250"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -211962,7 +212704,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:250"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211979,7 +212721,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -211995,13 +212737,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1503
-#AT_START_1504
-at_fn_group_banner 1504 'ovsdb-idl.at:250' \
+#AT_STOP_1506
+#AT_START_1507
+at_fn_group_banner 1507 'ovsdb-idl.at:250' \
   "simple idl, handling verification failure - Python" "" 90
 at_xfail=no
 (
-  $as_echo "1504. $at_setup_line: testing $at_desc ..."
+  $as_echo "1507. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:250" >"$at_check_line_file"
@@ -212013,7 +212755,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:250"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212026,7 +212768,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:250"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212053,7 +212795,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212085,7 +212827,7 @@
     '+verify 1 r, set 1 r 3' \
     'verify 1 r, set 1 r 3' \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212101,7 +212843,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:250"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -212130,7 +212872,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:250"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212147,7 +212889,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212163,13 +212905,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1504
-#AT_START_1505
-at_fn_group_banner 1505 'ovsdb-idl.at:250' \
+#AT_STOP_1507
+#AT_START_1508
+at_fn_group_banner 1508 'ovsdb-idl.at:250' \
   "simple idl, handling verification failure - Python tcp" "" 90
 at_xfail=no
 (
-  $as_echo "1505. $at_setup_line: testing $at_desc ..."
+  $as_echo "1508. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:250" >"$at_check_line_file"
@@ -212182,7 +212924,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:250"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212195,7 +212937,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:250"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212224,7 +212966,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212256,7 +212998,7 @@
     '+verify 1 r, set 1 r 3' \
     'verify 1 r, set 1 r 3' \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212272,7 +213014,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:250"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -212301,7 +213043,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:250"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212318,7 +213060,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212334,13 +213076,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1505
-#AT_START_1506
-at_fn_group_banner 1506 'ovsdb-idl.at:250' \
+#AT_STOP_1508
+#AT_START_1509
+at_fn_group_banner 1509 'ovsdb-idl.at:250' \
   "simple idl, handling verification failure - Python tcp6" "" 90
 at_xfail=no
 (
-  $as_echo "1506. $at_setup_line: testing $at_desc ..."
+  $as_echo "1509. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:250" >"$at_check_line_file"
@@ -212353,7 +213095,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:250"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212366,7 +213108,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:250"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212396,7 +213138,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212428,7 +213170,7 @@
     '+verify 1 r, set 1 r 3' \
     'verify 1 r, set 1 r 3' \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212444,7 +213186,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:250"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -212473,7 +213215,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:250: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:250"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212490,7 +213232,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212506,13 +213248,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1506
-#AT_START_1507
-at_fn_group_banner 1507 'ovsdb-idl.at:281' \
+#AT_STOP_1509
+#AT_START_1510
+at_fn_group_banner 1510 'ovsdb-idl.at:281' \
   "simple idl, increment operation - C" "            " 90
 at_xfail=no
 (
-  $as_echo "1507. $at_setup_line: testing $at_desc ..."
+  $as_echo "1510. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -212521,7 +213263,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:281"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212534,7 +213276,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:281"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212553,7 +213295,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212569,7 +213311,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, increment 0'"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:281"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, increment 0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212585,7 +213327,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:281"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -212607,7 +213349,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:281"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212624,7 +213366,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212640,13 +213382,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1507
-#AT_START_1508
-at_fn_group_banner 1508 'ovsdb-idl.at:281' \
+#AT_STOP_1510
+#AT_START_1511
+at_fn_group_banner 1511 'ovsdb-idl.at:281' \
   "simple idl, increment operation - Python" "       " 90
 at_xfail=no
 (
-  $as_echo "1508. $at_setup_line: testing $at_desc ..."
+  $as_echo "1511. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:281" >"$at_check_line_file"
@@ -212658,7 +213400,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:281"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212671,7 +213413,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:281"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212690,7 +213432,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212706,7 +213448,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: \$PYTHON \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, increment 0'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:281"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, increment 0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212722,7 +213464,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:281"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -212744,7 +213486,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:281"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212761,7 +213503,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212777,13 +213519,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1508
-#AT_START_1509
-at_fn_group_banner 1509 'ovsdb-idl.at:281' \
+#AT_STOP_1511
+#AT_START_1512
+at_fn_group_banner 1512 'ovsdb-idl.at:281' \
   "simple idl, increment operation - Python tcp" "   " 90
 at_xfail=no
 (
-  $as_echo "1509. $at_setup_line: testing $at_desc ..."
+  $as_echo "1512. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:281" >"$at_check_line_file"
@@ -212796,7 +213538,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:281"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212809,7 +213551,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:281"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212830,7 +213572,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212846,7 +213588,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: \$PYTHON \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, increment 0'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:281"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 r 2.0, increment 0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212862,7 +213604,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:281"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -212884,7 +213626,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:281"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212901,7 +213643,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212917,13 +213659,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1509
-#AT_START_1510
-at_fn_group_banner 1510 'ovsdb-idl.at:281' \
+#AT_STOP_1512
+#AT_START_1513
+at_fn_group_banner 1513 'ovsdb-idl.at:281' \
   "simple idl, increment operation - Python tcp6" "  " 90
 at_xfail=no
 (
-  $as_echo "1510. $at_setup_line: testing $at_desc ..."
+  $as_echo "1513. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:281" >"$at_check_line_file"
@@ -212936,7 +213678,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:281"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212949,7 +213691,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:281"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212971,7 +213713,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -212987,7 +213729,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: \$PYTHON \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, increment 0'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:281"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 r 2.0, increment 0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213003,7 +213745,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:281"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -213025,7 +213767,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:281: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:281"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213042,7 +213784,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213058,13 +213800,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1510
-#AT_START_1511
-at_fn_group_banner 1511 'ovsdb-idl.at:293' \
+#AT_STOP_1513
+#AT_START_1514
+at_fn_group_banner 1514 'ovsdb-idl.at:293' \
   "simple idl, aborting - C" "                       " 90
 at_xfail=no
 (
-  $as_echo "1511. $at_setup_line: testing $at_desc ..."
+  $as_echo "1514. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -213073,7 +213815,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:293"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213086,7 +213828,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:293"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213105,7 +213847,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213123,7 +213865,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:293"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, abort' \
 '+set 0 b 1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213139,7 +213881,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:293"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -213162,7 +213904,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:293"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213179,7 +213921,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213195,13 +213937,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1511
-#AT_START_1512
-at_fn_group_banner 1512 'ovsdb-idl.at:293' \
+#AT_STOP_1514
+#AT_START_1515
+at_fn_group_banner 1515 'ovsdb-idl.at:293' \
   "simple idl, aborting - Python" "                  " 90
 at_xfail=no
 (
-  $as_echo "1512. $at_setup_line: testing $at_desc ..."
+  $as_echo "1515. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:293" >"$at_check_line_file"
@@ -213213,7 +213955,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:293"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213226,7 +213968,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:293"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213245,7 +213987,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213263,7 +214005,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:293"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, abort' \
 '+set 0 b 1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213279,7 +214021,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:293"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -213302,7 +214044,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:293"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213319,7 +214061,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213335,13 +214077,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1512
-#AT_START_1513
-at_fn_group_banner 1513 'ovsdb-idl.at:293' \
+#AT_STOP_1515
+#AT_START_1516
+at_fn_group_banner 1516 'ovsdb-idl.at:293' \
   "simple idl, aborting - Python tcp" "              " 90
 at_xfail=no
 (
-  $as_echo "1513. $at_setup_line: testing $at_desc ..."
+  $as_echo "1516. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:293" >"$at_check_line_file"
@@ -213354,7 +214096,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:293"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213367,7 +214109,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:293"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213388,7 +214130,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213406,7 +214148,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:293"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 r 2.0, abort' \
 '+set 0 b 1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213422,7 +214164,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:293"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -213445,7 +214187,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:293"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213462,7 +214204,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213478,13 +214220,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1513
-#AT_START_1514
-at_fn_group_banner 1514 'ovsdb-idl.at:293' \
+#AT_STOP_1516
+#AT_START_1517
+at_fn_group_banner 1517 'ovsdb-idl.at:293' \
   "simple idl, aborting - Python tcp6" "             " 90
 at_xfail=no
 (
-  $as_echo "1514. $at_setup_line: testing $at_desc ..."
+  $as_echo "1517. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:293" >"$at_check_line_file"
@@ -213497,7 +214239,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:293"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213510,7 +214252,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:293"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213532,7 +214274,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213550,7 +214292,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:293"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 r 2.0, abort' \
 '+set 0 b 1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213566,7 +214308,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:293"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -213589,7 +214331,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:293: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:293"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213606,7 +214348,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213622,13 +214364,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1514
-#AT_START_1515
-at_fn_group_banner 1515 'ovsdb-idl.at:307' \
+#AT_STOP_1517
+#AT_START_1518
+at_fn_group_banner 1518 'ovsdb-idl.at:307' \
   "simple idl, destroy without commit or abort - C" "" 90
 at_xfail=no
 (
-  $as_echo "1515. $at_setup_line: testing $at_desc ..."
+  $as_echo "1518. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -213637,7 +214379,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:307"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213650,7 +214392,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:307"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213669,7 +214411,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213687,7 +214429,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:307"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213703,7 +214445,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:307"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -213726,7 +214468,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:307"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213743,7 +214485,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213759,13 +214501,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1515
-#AT_START_1516
-at_fn_group_banner 1516 'ovsdb-idl.at:307' \
+#AT_STOP_1518
+#AT_START_1519
+at_fn_group_banner 1519 'ovsdb-idl.at:307' \
   "simple idl, destroy without commit or abort - Python" "" 90
 at_xfail=no
 (
-  $as_echo "1516. $at_setup_line: testing $at_desc ..."
+  $as_echo "1519. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:307" >"$at_check_line_file"
@@ -213777,7 +214519,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:307"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213790,7 +214532,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:307"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213809,7 +214551,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213827,7 +214569,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:307"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213843,7 +214585,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:307"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -213866,7 +214608,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:307"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213883,7 +214625,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213899,13 +214641,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1516
-#AT_START_1517
-at_fn_group_banner 1517 'ovsdb-idl.at:307' \
+#AT_STOP_1519
+#AT_START_1520
+at_fn_group_banner 1520 'ovsdb-idl.at:307' \
   "simple idl, destroy without commit or abort - Python tcp" "" 90
 at_xfail=no
 (
-  $as_echo "1517. $at_setup_line: testing $at_desc ..."
+  $as_echo "1520. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:307" >"$at_check_line_file"
@@ -213918,7 +214660,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:307"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213931,7 +214673,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:307"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213952,7 +214694,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213970,7 +214712,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:307"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -213986,7 +214728,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:307"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -214009,7 +214751,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:307"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214026,7 +214768,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214042,13 +214784,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1517
-#AT_START_1518
-at_fn_group_banner 1518 'ovsdb-idl.at:307' \
+#AT_STOP_1520
+#AT_START_1521
+at_fn_group_banner 1521 'ovsdb-idl.at:307' \
   "simple idl, destroy without commit or abort - Python tcp6" "" 90
 at_xfail=no
 (
-  $as_echo "1518. $at_setup_line: testing $at_desc ..."
+  $as_echo "1521. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:307" >"$at_check_line_file"
@@ -214061,7 +214803,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:307"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214074,7 +214816,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:307"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214096,7 +214838,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214114,7 +214856,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:307"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214130,7 +214872,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:307"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -214153,7 +214895,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:307: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:307"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214170,7 +214912,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214186,13 +214928,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1518
-#AT_START_1519
-at_fn_group_banner 1519 'ovsdb-idl.at:321' \
+#AT_STOP_1521
+#AT_START_1522
+at_fn_group_banner 1522 'ovsdb-idl.at:321' \
   "self-linking idl, consistent ops - C" "           " 90
 at_xfail=no
 (
-  $as_echo "1519. $at_setup_line: testing $at_desc ..."
+  $as_echo "1522. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -214201,7 +214943,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:321"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214214,7 +214956,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:321"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214274,7 +215016,7 @@
        "table": "link1",
        "where": [],
        "row": {"k": ["uuid", "#0#"]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214290,7 +215032,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:321"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -214324,7 +215066,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:321"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214341,7 +215083,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214357,13 +215099,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1519
-#AT_START_1520
-at_fn_group_banner 1520 'ovsdb-idl.at:321' \
+#AT_STOP_1522
+#AT_START_1523
+at_fn_group_banner 1523 'ovsdb-idl.at:321' \
   "self-linking idl, consistent ops - Python" "      " 90
 at_xfail=no
 (
-  $as_echo "1520. $at_setup_line: testing $at_desc ..."
+  $as_echo "1523. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:321" >"$at_check_line_file"
@@ -214375,7 +215117,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:321"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214388,7 +215130,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:321"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214448,7 +215190,7 @@
        "table": "link1",
        "where": [],
        "row": {"k": ["uuid", "#0#"]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214464,7 +215206,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:321"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -214498,7 +215240,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:321"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214515,7 +215257,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214531,13 +215273,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1520
-#AT_START_1521
-at_fn_group_banner 1521 'ovsdb-idl.at:321' \
+#AT_STOP_1523
+#AT_START_1524
+at_fn_group_banner 1524 'ovsdb-idl.at:321' \
   "self-linking idl, consistent ops - Python tcp" "  " 90
 at_xfail=no
 (
-  $as_echo "1521. $at_setup_line: testing $at_desc ..."
+  $as_echo "1524. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:321" >"$at_check_line_file"
@@ -214550,7 +215292,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:321"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214563,7 +215305,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:321"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214625,7 +215367,7 @@
        "table": "link1",
        "where": [],
        "row": {"k": ["uuid", "#0#"]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214641,7 +215383,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:321"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -214675,7 +215417,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:321"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214692,7 +215434,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214708,13 +215450,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1521
-#AT_START_1522
-at_fn_group_banner 1522 'ovsdb-idl.at:321' \
+#AT_STOP_1524
+#AT_START_1525
+at_fn_group_banner 1525 'ovsdb-idl.at:321' \
   "self-linking idl, consistent ops - Python tcp6" " " 90
 at_xfail=no
 (
-  $as_echo "1522. $at_setup_line: testing $at_desc ..."
+  $as_echo "1525. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:321" >"$at_check_line_file"
@@ -214727,7 +215469,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:321"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214740,7 +215482,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:321"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214803,7 +215545,7 @@
        "table": "link1",
        "where": [],
        "row": {"k": ["uuid", "#0#"]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214819,7 +215561,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:321"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -214853,7 +215595,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:321: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:321"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214870,7 +215612,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214886,13 +215628,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1522
-#AT_START_1523
-at_fn_group_banner 1523 'ovsdb-idl.at:365' \
+#AT_STOP_1525
+#AT_START_1526
+at_fn_group_banner 1526 'ovsdb-idl.at:365' \
   "self-linking idl, inconsistent ops - C" "         " 90
 at_xfail=no
 (
-  $as_echo "1523. $at_setup_line: testing $at_desc ..."
+  $as_echo "1526. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -214901,7 +215643,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:365"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214914,7 +215656,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:365"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -214986,7 +215728,7 @@
        "table": "link1",
        "where": []}]' \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215002,7 +215744,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: sort stdout | \${PERL} \$srcdir/uuidfilt.pl| sed -e '/004:/s/row <[23]> references/row  references/'"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:365"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl| sed -e '/004:/s/row <[23]> references/row  references/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -215032,7 +215774,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:365"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215049,7 +215791,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215065,13 +215807,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1523
-#AT_START_1524
-at_fn_group_banner 1524 'ovsdb-idl.at:365' \
+#AT_STOP_1526
+#AT_START_1527
+at_fn_group_banner 1527 'ovsdb-idl.at:365' \
   "self-linking idl, inconsistent ops - Python" "    " 90
 at_xfail=no
 (
-  $as_echo "1524. $at_setup_line: testing $at_desc ..."
+  $as_echo "1527. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:365" >"$at_check_line_file"
@@ -215083,7 +215825,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:365"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215096,7 +215838,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:365"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215168,7 +215910,7 @@
        "table": "link1",
        "where": []}]' \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215184,7 +215926,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: sort stdout | \${PERL} \$srcdir/uuidfilt.pl| sed -e '/004:/s/row <[23]> references/row  references/'"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:365"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl| sed -e '/004:/s/row <[23]> references/row  references/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -215214,7 +215956,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:365"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215231,7 +215973,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215247,13 +215989,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1524
-#AT_START_1525
-at_fn_group_banner 1525 'ovsdb-idl.at:365' \
+#AT_STOP_1527
+#AT_START_1528
+at_fn_group_banner 1528 'ovsdb-idl.at:365' \
   "self-linking idl, inconsistent ops - Python tcp" "" 90
 at_xfail=no
 (
-  $as_echo "1525. $at_setup_line: testing $at_desc ..."
+  $as_echo "1528. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:365" >"$at_check_line_file"
@@ -215266,7 +216008,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:365"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215279,7 +216021,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:365"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215353,7 +216095,7 @@
        "table": "link1",
        "where": []}]' \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215369,7 +216111,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: sort stdout | \${PERL} \$srcdir/uuidfilt.pl| sed -e '/004:/s/row <[23]> references/row  references/'"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:365"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl| sed -e '/004:/s/row <[23]> references/row  references/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -215399,7 +216141,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:365"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215416,7 +216158,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215432,13 +216174,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1525
-#AT_START_1526
-at_fn_group_banner 1526 'ovsdb-idl.at:365' \
+#AT_STOP_1528
+#AT_START_1529
+at_fn_group_banner 1529 'ovsdb-idl.at:365' \
   "self-linking idl, inconsistent ops - Python tcp6" "" 90
 at_xfail=no
 (
-  $as_echo "1526. $at_setup_line: testing $at_desc ..."
+  $as_echo "1529. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:365" >"$at_check_line_file"
@@ -215451,7 +216193,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:365"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215464,7 +216206,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:365"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215539,7 +216281,7 @@
        "table": "link1",
        "where": []}]' \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215555,7 +216297,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: sort stdout | \${PERL} \$srcdir/uuidfilt.pl| sed -e '/004:/s/row <[23]> references/row  references/'"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:365"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl| sed -e '/004:/s/row <[23]> references/row  references/'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -215585,7 +216327,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:365: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:365"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215602,7 +216344,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215618,13 +216360,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1526
-#AT_START_1527
-at_fn_group_banner 1527 'ovsdb-idl.at:413' \
+#AT_STOP_1529
+#AT_START_1530
+at_fn_group_banner 1530 'ovsdb-idl.at:413' \
   "self-linking idl, sets - C" "                     " 90
 at_xfail=no
 (
-  $as_echo "1527. $at_setup_line: testing $at_desc ..."
+  $as_echo "1530. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -215633,7 +216375,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:413"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215646,7 +216388,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:413"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215720,7 +216462,7 @@
       {"op": "delete",
        "table": "link1",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215736,7 +216478,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:413"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -215769,7 +216511,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:413"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215786,7 +216528,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215802,13 +216544,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1527
-#AT_START_1528
-at_fn_group_banner 1528 'ovsdb-idl.at:413' \
+#AT_STOP_1530
+#AT_START_1531
+at_fn_group_banner 1531 'ovsdb-idl.at:413' \
   "self-linking idl, sets - Python" "                " 90
 at_xfail=no
 (
-  $as_echo "1528. $at_setup_line: testing $at_desc ..."
+  $as_echo "1531. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:413" >"$at_check_line_file"
@@ -215820,7 +216562,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:413"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215833,7 +216575,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:413"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215907,7 +216649,7 @@
       {"op": "delete",
        "table": "link1",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215923,7 +216665,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:413"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -215956,7 +216698,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:413"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215973,7 +216715,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -215989,13 +216731,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1528
-#AT_START_1529
-at_fn_group_banner 1529 'ovsdb-idl.at:413' \
+#AT_STOP_1531
+#AT_START_1532
+at_fn_group_banner 1532 'ovsdb-idl.at:413' \
   "self-linking idl, sets - Python tcp" "            " 90
 at_xfail=no
 (
-  $as_echo "1529. $at_setup_line: testing $at_desc ..."
+  $as_echo "1532. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:413" >"$at_check_line_file"
@@ -216008,7 +216750,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:413"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216021,7 +216763,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:413"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216097,7 +216839,7 @@
       {"op": "delete",
        "table": "link1",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216113,7 +216855,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:413"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -216146,7 +216888,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:413"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216163,7 +216905,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216179,13 +216921,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1529
-#AT_START_1530
-at_fn_group_banner 1530 'ovsdb-idl.at:413' \
+#AT_STOP_1532
+#AT_START_1533
+at_fn_group_banner 1533 'ovsdb-idl.at:413' \
   "self-linking idl, sets - Python tcp6" "           " 90
 at_xfail=no
 (
-  $as_echo "1530. $at_setup_line: testing $at_desc ..."
+  $as_echo "1533. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:413" >"$at_check_line_file"
@@ -216198,7 +216940,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:413"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216211,7 +216953,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:413"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216288,7 +217030,7 @@
       {"op": "delete",
        "table": "link1",
        "where": []}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216304,7 +217046,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:413"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -216337,7 +217079,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:413: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:413"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216354,7 +217096,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216370,13 +217112,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1530
-#AT_START_1531
-at_fn_group_banner 1531 'ovsdb-idl.at:463' \
+#AT_STOP_1533
+#AT_START_1534
+at_fn_group_banner 1534 'ovsdb-idl.at:463' \
   "external-linking idl, consistent ops - C" "       " 90
 at_xfail=no
 (
-  $as_echo "1531. $at_setup_line: testing $at_desc ..."
+  $as_echo "1534. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -216385,7 +217127,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:463"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216398,7 +217140,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:463"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216428,7 +217170,7 @@
        "table": "link1",
        "row": {"i": 1, "k": ["named-uuid", "row1"], "l2": ["set", [["named-uuid", "row0"]]]},
        "uuid-name": "row1"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216444,7 +217186,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:463"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -216467,7 +217209,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:463"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216484,7 +217226,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216500,13 +217242,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1531
-#AT_START_1532
-at_fn_group_banner 1532 'ovsdb-idl.at:463' \
+#AT_STOP_1534
+#AT_START_1535
+at_fn_group_banner 1535 'ovsdb-idl.at:463' \
   "external-linking idl, consistent ops - Python" "  " 90
 at_xfail=no
 (
-  $as_echo "1532. $at_setup_line: testing $at_desc ..."
+  $as_echo "1535. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:463" >"$at_check_line_file"
@@ -216518,7 +217260,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:463"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216531,7 +217273,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:463"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216561,7 +217303,7 @@
        "table": "link1",
        "row": {"i": 1, "k": ["named-uuid", "row1"], "l2": ["set", [["named-uuid", "row0"]]]},
        "uuid-name": "row1"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216577,7 +217319,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:463"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -216600,7 +217342,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:463"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216617,7 +217359,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216633,13 +217375,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1532
-#AT_START_1533
-at_fn_group_banner 1533 'ovsdb-idl.at:463' \
+#AT_STOP_1535
+#AT_START_1536
+at_fn_group_banner 1536 'ovsdb-idl.at:463' \
   "external-linking idl, consistent ops - Python tcp" "" 90
 at_xfail=no
 (
-  $as_echo "1533. $at_setup_line: testing $at_desc ..."
+  $as_echo "1536. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:463" >"$at_check_line_file"
@@ -216652,7 +217394,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:463"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216665,7 +217407,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:463"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216697,7 +217439,7 @@
        "table": "link1",
        "row": {"i": 1, "k": ["named-uuid", "row1"], "l2": ["set", [["named-uuid", "row0"]]]},
        "uuid-name": "row1"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216713,7 +217455,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:463"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -216736,7 +217478,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:463"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216753,7 +217495,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216769,13 +217511,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1533
-#AT_START_1534
-at_fn_group_banner 1534 'ovsdb-idl.at:463' \
+#AT_STOP_1536
+#AT_START_1537
+at_fn_group_banner 1537 'ovsdb-idl.at:463' \
   "external-linking idl, consistent ops - Python tcp6" "" 90
 at_xfail=no
 (
-  $as_echo "1534. $at_setup_line: testing $at_desc ..."
+  $as_echo "1537. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:463" >"$at_check_line_file"
@@ -216788,7 +217530,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:463"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216801,7 +217543,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=ptcp:0:[::1] --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:463"
 ( $at_check_trace; ovsdb-server --log-file '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:0:[::1] --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216834,7 +217576,7 @@
        "table": "link1",
        "row": {"i": 1, "k": ["named-uuid", "row1"], "l2": ["set", [["named-uuid", "row0"]]]},
        "uuid-name": "row1"}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216850,7 +217592,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:463"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -216873,7 +217615,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:463: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:463"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216890,7 +217632,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216906,13 +217648,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1534
-#AT_START_1535
-at_fn_group_banner 1535 'ovsdb-idl.at:481' \
+#AT_STOP_1537
+#AT_START_1538
+at_fn_group_banner 1538 'ovsdb-idl.at:481' \
   "external-linking idl, insert ops - Python" "      " 90
 at_xfail=no
 (
-  $as_echo "1535. $at_setup_line: testing $at_desc ..."
+  $as_echo "1538. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:481" >"$at_check_line_file"
@@ -216924,7 +217666,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:481: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:481"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216937,7 +217679,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:481: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:481"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216951,7 +217693,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:481: \$PYTHON \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'linktest'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'linktest'" "ovsdb-idl.at:481"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'linktest'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -216967,7 +217709,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:481: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:481"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -216990,7 +217732,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:481: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:481"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217007,7 +217749,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217023,13 +217765,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1535
-#AT_START_1536
-at_fn_group_banner 1536 'ovsdb-idl.at:491' \
+#AT_STOP_1538
+#AT_START_1539
+at_fn_group_banner 1539 'ovsdb-idl.at:491' \
   "getattr idl, insert ops - Python" "               " 90
 at_xfail=no
 (
-  $as_echo "1536. $at_setup_line: testing $at_desc ..."
+  $as_echo "1539. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:491" >"$at_check_line_file"
@@ -217041,7 +217783,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:491: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:491"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217054,7 +217796,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:491: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:491"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217068,7 +217810,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:491: \$PYTHON \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'getattrtest'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'getattrtest'" "ovsdb-idl.at:491"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'getattrtest'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217084,7 +217826,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:491: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:491"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217106,7 +217848,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:491: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:491"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217123,7 +217865,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217139,13 +217881,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1536
-#AT_START_1537
-at_fn_group_banner 1537 'ovsdb-idl.at:500' \
+#AT_STOP_1539
+#AT_START_1540
+at_fn_group_banner 1540 'ovsdb-idl.at:500' \
   "row-from-json idl, whats this - Python" "         " 90
 at_xfail=no
 (
-  $as_echo "1537. $at_setup_line: testing $at_desc ..."
+  $as_echo "1540. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
    $as_echo "ovsdb-idl.at:500" >"$at_check_line_file"
@@ -217157,7 +217899,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:500: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:500"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217170,7 +217912,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:500: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:500"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217195,7 +217937,7 @@
       {"op": "insert",
        "table": "simple",
        "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217211,7 +217953,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:500: \$PYTHON \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'notifytest insert 2, notifytest set 1 b 1, notifytest delete 0'"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'notifytest insert 2, notifytest set 1 b 1, notifytest delete 0'" "ovsdb-idl.at:500"
 ( $at_check_trace; $PYTHON $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'notifytest insert 2, notifytest set 1 b 1, notifytest delete 0'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217227,7 +217969,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:500: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:500"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217251,7 +217993,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:500: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:500"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217268,7 +218010,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217284,13 +218026,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1537
-#AT_START_1538
-at_fn_group_banner 1538 'ovsdb-idl.at:517' \
+#AT_STOP_1540
+#AT_START_1541
+at_fn_group_banner 1541 'ovsdb-idl.at:517' \
   "idl handling of missing tables and columns - C" " " 90
 at_xfail=no
 (
-  $as_echo "1538. $at_setup_line: testing $at_desc ..."
+  $as_echo "1541. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -217304,7 +218046,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:525: ovsdb-tool create db \$abs_srcdir/idltest2.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest2.ovsschema" "ovsdb-idl.at:525"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest2.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217317,7 +218059,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217376,7 +218118,7 @@
        "table": "link1",
        "where": [],
        "row": {"k": ["uuid", "#0#"]}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -217392,7 +218134,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:553: sort stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:553"
 ( $at_check_trace; sort stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217427,7 +218169,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:573: grep ovsdb_idl stderr | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:573"
 ( $at_check_trace; grep ovsdb_idl stderr | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217447,7 +218189,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:581: grep -c '\"monitor\"' stderr"
 at_fn_check_prepare_trace "ovsdb-idl.at:581"
 ( $at_check_trace; grep -c '"monitor"' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217462,7 +218204,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:583: grep '\"monitor\"' stderr | grep link2"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:583"
 ( $at_check_trace; grep '"monitor"' stderr | grep link2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217475,7 +218217,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:584: grep '\"monitor\"' stderr | grep l2"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:584"
 ( $at_check_trace; grep '"monitor"' stderr | grep l2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217488,7 +218230,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:585: grep '\"monitor\"' stderr | grep -c '\"link1\"'"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:585"
 ( $at_check_trace; grep '"monitor"' stderr | grep -c '"link1"'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217503,7 +218245,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:587: grep '\"monitor\"' stderr | grep -c '\"ua\"'"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:587"
 ( $at_check_trace; grep '"monitor"' stderr | grep -c '"ua"'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217519,7 +218261,7 @@
 $as_echo "$at_srcdir/ovsdb-idl.at:589: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-idl.at:589"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217536,7 +218278,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217552,13 +218294,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1538
-#AT_START_1539
-at_fn_group_banner 1539 'ovs-vsctl.at:145' \
+#AT_STOP_1541
+#AT_START_1542
+at_fn_group_banner 1542 'ovs-vsctl.at:145' \
   "ovs-vsctl connection retry" "                     " 91
 at_xfail=no
 (
-  $as_echo "1539. $at_setup_line: testing $at_desc ..."
+  $as_echo "1542. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=$PWD; export OVS_RUNDIR
@@ -217567,7 +218309,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:149: ovs-vsctl --db=unix:foo --timeout=10 -vreconnect:emer -- init"
 at_fn_check_prepare_trace "ovs-vsctl.at:149"
 ( $at_check_trace; ovs-vsctl --db=unix:foo --timeout=10 -vreconnect:emer -- init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -217580,7 +218322,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:151: sed 's/([^()]*)/(...reason...)/' stderr"
 at_fn_check_prepare_trace "ovs-vsctl.at:151"
 ( $at_check_trace; sed 's/([^()]*)/(...reason...)/' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217598,7 +218340,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:156"
 ( $at_check_trace; ovs-vsctl --db=unix:foo --timeout=1 --retry -vreconnect:emer -vPATTERN:console:'%c|%p|%m' -- init
    echo $? > status
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -217611,7 +218353,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:160: grep -c 'terminating with signal' stderr"
 at_fn_check_prepare_trace "ovs-vsctl.at:160"
 ( $at_check_trace; grep -c 'terminating with signal' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217627,7 +218369,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:163: cat status"
 at_fn_check_prepare_trace "ovs-vsctl.at:163"
 ( $at_check_trace; cat status
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217644,7 +218386,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:167: cat status"
 at_fn_check_prepare_trace "ovs-vsctl.at:167"
 ( $at_check_trace; cat status
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217663,7 +218405,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:172"
 ( $at_check_trace; ovs-vsctl --db=punix:foo --timeout=1 -vreconnect:emer -vPATTERN:console:'%c|%p|%m' -- init
    echo $? > status
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -217676,7 +218418,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:176: grep -c 'terminating with signal' stderr"
 at_fn_check_prepare_trace "ovs-vsctl.at:176"
 ( $at_check_trace; grep -c 'terminating with signal' stderr
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217692,7 +218434,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:179: cat status"
 at_fn_check_prepare_trace "ovs-vsctl.at:179"
 ( $at_check_trace; cat status
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217709,7 +218451,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:183: cat status"
 at_fn_check_prepare_trace "ovs-vsctl.at:183"
 ( $at_check_trace; cat status
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217725,13 +218467,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1539
-#AT_START_1540
-at_fn_group_banner 1540 'ovs-vsctl.at:191' \
+#AT_STOP_1542
+#AT_START_1543
+at_fn_group_banner 1543 'ovs-vsctl.at:191' \
   "add-br a" "                                       " 92
 at_xfail=no
 (
-  $as_echo "1540. $at_setup_line: testing $at_desc ..."
+  $as_echo "1543. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -217740,7 +218482,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:193: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:193"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217761,7 +218503,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217774,7 +218516,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:193: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:193"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217789,7 +218531,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:194"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217801,7 +218543,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:194: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:194"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217818,7 +218560,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217840,7 +218582,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217854,7 +218596,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:195: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217871,7 +218613,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217894,7 +218636,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217908,7 +218650,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:195: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217925,7 +218667,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217948,7 +218690,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -217960,7 +218702,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:195: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217977,7 +218719,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -217999,7 +218741,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -218011,7 +218753,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:195: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218028,7 +218770,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218051,7 +218793,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -218065,7 +218807,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:195: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218082,7 +218824,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218106,7 +218848,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -218120,7 +218862,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:195: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218137,7 +218879,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218163,7 +218905,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -218177,7 +218919,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:195: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218194,7 +218936,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218216,7 +218958,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:195: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a"
 at_fn_check_prepare_trace "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -218231,7 +218973,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:195: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:195"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218248,7 +218990,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218270,7 +219012,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:196"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -218282,7 +219024,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:196: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:196"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218299,7 +219041,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218322,7 +219064,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:196"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -218336,7 +219078,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:196: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:196"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218353,7 +219095,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218375,7 +219117,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:196"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named a
@@ -218389,7 +219131,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:196: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:196"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218406,7 +219148,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218429,7 +219171,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:197"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -218441,7 +219183,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:197: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:197"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218458,7 +219200,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218480,7 +219222,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:197"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named a
@@ -218494,7 +219236,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:197: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:197"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218511,7 +219253,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218533,7 +219275,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:198: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:198"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218550,7 +219292,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218566,13 +219308,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1540
-#AT_START_1541
-at_fn_group_banner 1541 'ovs-vsctl.at:201' \
+#AT_STOP_1543
+#AT_START_1544
+at_fn_group_banner 1544 'ovs-vsctl.at:201' \
   "add-br a, add-br a" "                             " 92
 at_xfail=no
 (
-  $as_echo "1541. $at_setup_line: testing $at_desc ..."
+  $as_echo "1544. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -218581,7 +219323,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:203: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:203"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218602,7 +219344,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218615,7 +219357,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:203: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:203"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218630,7 +219372,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:204"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -218642,7 +219384,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:204: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:204"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218659,7 +219401,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218681,7 +219423,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:205"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: cannot create a bridge named a because a bridge named a already exists
@@ -218695,7 +219437,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:205: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:205"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218712,7 +219454,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218733,7 +219475,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:208: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:208"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218750,7 +219492,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218766,13 +219508,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1541
-#AT_START_1542
-at_fn_group_banner 1542 'ovs-vsctl.at:211' \
+#AT_STOP_1544
+#AT_START_1545
+at_fn_group_banner 1545 'ovs-vsctl.at:211' \
   "add-br a, add-br b" "                             " 92
 at_xfail=no
 (
-  $as_echo "1542. $at_setup_line: testing $at_desc ..."
+  $as_echo "1545. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -218781,7 +219523,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:213: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:213"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218802,7 +219544,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218815,7 +219557,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:213: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:213"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218832,7 +219574,7 @@
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br a
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -218844,7 +219586,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:214: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:214"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218861,7 +219603,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218883,7 +219625,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:216"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br a b 9
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"--may-exist add-br a b 9\" but a is not a VLAN bridge
@@ -218897,7 +219639,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:216: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:216"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218914,7 +219656,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218936,7 +219678,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -218951,7 +219693,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218968,7 +219710,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -218991,7 +219733,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219005,7 +219747,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219022,7 +219764,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219045,7 +219787,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219057,7 +219799,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219074,7 +219816,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219095,7 +219837,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219107,7 +219849,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219124,7 +219866,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219146,7 +219888,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219158,7 +219900,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219175,7 +219917,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219198,7 +219940,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219212,7 +219954,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219229,7 +219971,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219253,7 +219995,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219267,7 +220009,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219284,7 +220026,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219310,7 +220052,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219324,7 +220066,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219341,7 +220083,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219363,7 +220105,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a"
 at_fn_check_prepare_trace "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219378,7 +220120,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219395,7 +220137,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219416,7 +220158,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219430,7 +220172,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219447,7 +220189,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219471,7 +220213,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219485,7 +220227,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219502,7 +220244,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219528,7 +220270,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219542,7 +220284,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219559,7 +220301,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219581,7 +220323,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent b -- br-to-vlan b"
 at_fn_check_prepare_trace "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent b -- br-to-vlan b
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219596,7 +220338,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:220: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:220"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219613,7 +220355,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219635,7 +220377,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:221"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219647,7 +220389,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:221: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:221"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219664,7 +220406,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219687,7 +220429,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:221"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219701,7 +220443,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:221: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:221"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219718,7 +220460,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219740,7 +220482,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:221"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named a
@@ -219754,7 +220496,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:221: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:221"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219771,7 +220513,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219794,7 +220536,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:222"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219806,7 +220548,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:222: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:222"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219823,7 +220565,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219845,7 +220587,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:222"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named a
@@ -219859,7 +220601,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:222: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:222"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219876,7 +220618,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219899,7 +220641,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:223"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219911,7 +220653,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:223: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:223"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219928,7 +220670,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219951,7 +220693,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:223"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -219965,7 +220707,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:223: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:223"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -219982,7 +220724,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220004,7 +220746,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:223"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named b
@@ -220018,7 +220760,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:223: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:223"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220035,7 +220777,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220058,7 +220800,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:224"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220070,7 +220812,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:224: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:224"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220087,7 +220829,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220109,7 +220851,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:224"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named b
@@ -220123,7 +220865,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:224: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:224"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220140,7 +220882,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220162,7 +220904,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:225: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:225"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220179,7 +220921,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220195,13 +220937,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1542
-#AT_START_1543
-at_fn_group_banner 1543 'ovs-vsctl.at:228' \
+#AT_STOP_1545
+#AT_START_1546
+at_fn_group_banner 1546 'ovs-vsctl.at:228' \
   "add-br a, add-br b, del-br a" "                   " 92
 at_xfail=no
 (
-  $as_echo "1543. $at_setup_line: testing $at_desc ..."
+  $as_echo "1546. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -220210,7 +220952,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:230: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:230"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220231,7 +220973,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220244,7 +220986,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:230: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:230"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220263,7 +221005,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br b
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket del-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220275,7 +221017,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:231: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:231"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220292,7 +221034,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220314,7 +221056,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220328,7 +221070,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:233: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220345,7 +221087,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220368,7 +221110,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220382,7 +221124,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:233: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220399,7 +221141,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220422,7 +221164,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220434,7 +221176,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:233: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220451,7 +221193,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220473,7 +221215,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220485,7 +221227,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:233: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220502,7 +221244,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220525,7 +221267,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220539,7 +221281,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:233: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220556,7 +221298,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220580,7 +221322,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220594,7 +221336,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:233: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220611,7 +221353,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220637,7 +221379,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220651,7 +221393,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:233: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220668,7 +221410,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220690,7 +221432,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:233: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent b -- br-to-vlan b"
 at_fn_check_prepare_trace "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent b -- br-to-vlan b
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220705,7 +221447,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:233: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:233"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220722,7 +221464,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220744,7 +221486,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:234"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220756,7 +221498,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:234: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:234"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220773,7 +221515,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220796,7 +221538,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:234"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220810,7 +221552,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:234: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:234"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220827,7 +221569,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220849,7 +221591,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:234"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named b
@@ -220863,7 +221605,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:234: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:234"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220880,7 +221622,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220903,7 +221645,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:235"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -220915,7 +221657,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:235: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:235"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220932,7 +221674,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220954,7 +221696,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:235"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named b
@@ -220968,7 +221710,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:235: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:235"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -220985,7 +221727,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221007,7 +221749,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:236: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:236"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221024,7 +221766,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221040,13 +221782,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1543
-#AT_START_1544
-at_fn_group_banner 1544 'ovs-vsctl.at:239' \
+#AT_STOP_1546
+#AT_START_1547
+at_fn_group_banner 1547 'ovs-vsctl.at:239' \
   "add-br a, del-br a, add-br a" "                   " 92
 at_xfail=no
 (
-  $as_echo "1544. $at_setup_line: testing $at_desc ..."
+  $as_echo "1547. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -221055,7 +221797,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:241: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:241"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221076,7 +221818,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221089,7 +221831,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:241: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:241"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221102,7 +221844,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:242: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- add-br a -- del-br a -- add-br a -- set Interface a other_config:key=value -- get Interface a other_config:key"
 at_fn_check_prepare_trace "ovs-vsctl.at:242"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- add-br a -- del-br a -- add-br a -- set Interface a other_config:key=value -- get Interface a other_config:key
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221120,7 +221862,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:242: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:242"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221137,7 +221879,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221159,7 +221901,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221173,7 +221915,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:253: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221190,7 +221932,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221213,7 +221955,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221227,7 +221969,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:253: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221244,7 +221986,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221267,7 +222009,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221279,7 +222021,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:253: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221296,7 +222038,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221318,7 +222060,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221330,7 +222072,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:253: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221347,7 +222089,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221370,7 +222112,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221384,7 +222126,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:253: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221401,7 +222143,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221425,7 +222167,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221439,7 +222181,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:253: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221456,7 +222198,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221482,7 +222224,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221496,7 +222238,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:253: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221513,7 +222255,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221535,7 +222277,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:253: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a"
 at_fn_check_prepare_trace "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221550,7 +222292,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:253: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:253"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221567,7 +222309,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221589,7 +222331,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:254"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221601,7 +222343,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:254: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:254"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221618,7 +222360,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221641,7 +222383,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:254"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221655,7 +222397,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:254: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:254"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221672,7 +222414,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221694,7 +222436,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:254"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named a
@@ -221708,7 +222450,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:254: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:254"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221725,7 +222467,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221748,7 +222490,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:255"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221760,7 +222502,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:255: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:255"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221777,7 +222519,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221799,7 +222541,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:255"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named a
@@ -221813,7 +222555,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:255: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:255"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221830,7 +222572,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221852,7 +222594,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:256: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:256"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221869,7 +222611,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221885,13 +222627,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1544
-#AT_START_1545
-at_fn_group_banner 1545 'ovs-vsctl.at:259' \
+#AT_STOP_1547
+#AT_START_1548
+at_fn_group_banner 1548 'ovs-vsctl.at:259' \
   "add-br a, add-port a a1, add-port a a2" "         " 92
 at_xfail=no
 (
-  $as_echo "1545. $at_setup_line: testing $at_desc ..."
+  $as_echo "1548. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -221900,7 +222642,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:261: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:261"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221921,7 +222663,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221934,7 +222676,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:261: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:261"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221955,7 +222697,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port a a1
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port a a2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -221967,7 +222709,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:262: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:262"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -221984,7 +222726,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222006,7 +222748,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222020,7 +222762,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:267: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222037,7 +222779,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222060,7 +222802,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222074,7 +222816,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:267: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222091,7 +222833,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222114,7 +222856,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222126,7 +222868,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:267: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222143,7 +222885,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222165,7 +222907,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222177,7 +222919,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:267: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222194,7 +222936,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222217,7 +222959,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222231,7 +222973,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:267: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222248,7 +222990,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222272,7 +223014,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222286,7 +223028,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:267: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222303,7 +223045,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222329,7 +223071,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222343,7 +223085,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:267: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222360,7 +223102,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222382,7 +223124,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:267: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a"
 at_fn_check_prepare_trace "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222397,7 +223139,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:267: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:267"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222414,7 +223156,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222436,7 +223178,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:268"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222451,7 +223193,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:268: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:268"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222468,7 +223210,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222491,7 +223233,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:268"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222505,7 +223247,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:268: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:268"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222522,7 +223264,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222544,7 +223286,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:268"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named a
@@ -222558,7 +223300,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:268: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:268"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222575,7 +223317,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222597,7 +223339,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:268"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222611,7 +223353,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:268: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:268"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222628,7 +223370,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222649,7 +223391,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:268"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222663,7 +223405,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:268: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:268"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222680,7 +223422,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222702,7 +223444,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:269"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222717,7 +223459,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:269: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:269"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222734,7 +223476,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222756,7 +223498,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:269"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named a
@@ -222770,7 +223512,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:269: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:269"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222787,7 +223529,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222809,7 +223551,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:269"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222823,7 +223565,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:269: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:269"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222840,7 +223582,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222861,7 +223603,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:269"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -222875,7 +223617,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:269: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:269"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222892,7 +223634,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222913,7 +223655,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:270: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:270"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222930,7 +223672,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222946,13 +223688,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1545
-#AT_START_1546
-at_fn_group_banner 1546 'ovs-vsctl.at:273' \
+#AT_STOP_1548
+#AT_START_1549
+at_fn_group_banner 1549 'ovs-vsctl.at:273' \
   "add-br a, add-port a a1, add-port a a1" "         " 92
 at_xfail=no
 (
-  $as_echo "1546. $at_setup_line: testing $at_desc ..."
+  $as_echo "1549. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -222961,7 +223703,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:275: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:275"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222982,7 +223724,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -222995,7 +223737,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:275: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:275"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223012,7 +223754,7 @@
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br a
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port a a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223024,7 +223766,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:276: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:276"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223041,7 +223783,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223063,7 +223805,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:279"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port a a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: cannot create a port named a1 because a port named a1 already exists on bridge a
@@ -223077,7 +223819,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:279: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:279"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223094,7 +223836,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223115,7 +223857,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:282: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:282"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223132,7 +223874,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223148,13 +223890,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1546
-#AT_START_1547
-at_fn_group_banner 1547 'ovs-vsctl.at:285' \
+#AT_STOP_1549
+#AT_START_1550
+at_fn_group_banner 1550 'ovs-vsctl.at:285' \
   "add-br a b, add-port a a1, add-port b b1, del-br a" "" 92
 at_xfail=no
 (
-  $as_echo "1547. $at_setup_line: testing $at_desc ..."
+  $as_echo "1550. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -223163,7 +223905,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:287: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:287"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223184,7 +223926,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223197,7 +223939,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:287: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:287"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223210,7 +223952,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:288: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- add-br a -- add-br b -- add-port a a1 -- add-port b b1 -- --if-exists del-port b b2 -- del-br a"
 at_fn_check_prepare_trace "ovs-vsctl.at:288"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- add-br a -- add-br b -- add-port a a1 -- add-port b b1 -- --if-exists del-port b b2 -- del-br a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223229,7 +223971,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:288: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:288"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223246,7 +223988,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223268,7 +224010,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223282,7 +224024,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:301: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223299,7 +224041,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223322,7 +224064,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223336,7 +224078,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:301: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223353,7 +224095,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223376,7 +224118,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223388,7 +224130,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:301: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223405,7 +224147,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223427,7 +224169,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223439,7 +224181,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:301: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223456,7 +224198,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223479,7 +224221,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223493,7 +224235,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:301: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223510,7 +224252,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223534,7 +224276,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223548,7 +224290,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:301: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223565,7 +224307,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223591,7 +224333,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223605,7 +224347,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:301: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223622,7 +224364,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223644,7 +224386,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:301: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent b -- br-to-vlan b"
 at_fn_check_prepare_trace "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent b -- br-to-vlan b
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223659,7 +224401,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:301: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:301"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223676,7 +224418,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223698,7 +224440,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:302"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223712,7 +224454,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:302: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:302"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223729,7 +224471,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223752,7 +224494,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:302"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223766,7 +224508,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:302: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:302"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223783,7 +224525,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223805,7 +224547,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:302"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named b
@@ -223819,7 +224561,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:302: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:302"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223836,7 +224578,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223858,7 +224600,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:302"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br b1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223872,7 +224614,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:302: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:302"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223889,7 +224631,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223911,7 +224653,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:303"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -223925,7 +224667,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:303: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:303"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223942,7 +224684,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223964,7 +224706,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:303"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named b
@@ -223978,7 +224720,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:303: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:303"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -223995,7 +224737,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224017,7 +224759,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:303"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br b1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224031,7 +224773,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:303: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:303"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224048,7 +224790,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224069,7 +224811,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:304: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:304"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224086,7 +224828,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224102,13 +224844,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1547
-#AT_START_1548
-at_fn_group_banner 1548 'ovs-vsctl.at:307' \
+#AT_STOP_1550
+#AT_START_1551
+at_fn_group_banner 1551 'ovs-vsctl.at:307' \
   "add-br a, add-bond a bond0 a1 a2 a3" "            " 92
 at_xfail=no
 (
-  $as_echo "1548. $at_setup_line: testing $at_desc ..."
+  $as_echo "1551. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -224117,7 +224859,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:309: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:309"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224138,7 +224880,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224151,7 +224893,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:309: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:309"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224168,7 +224910,7 @@
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br a
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-bond a bond0 a1 a2 a3
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224180,7 +224922,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:310: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:310"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224197,7 +224939,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224219,7 +224961,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:313"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-bond a bond0 a3 a1 a2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224231,7 +224973,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:313: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:313"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224248,7 +224990,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224270,7 +225012,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:315"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-bond a bond0 a2 a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"--may-exist add-bond a bond0 a2 a1\" but bond0 actually has interface(s) a1, a2, a3
@@ -224284,7 +225026,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:315: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:315"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224301,7 +225043,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224323,7 +225065,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224337,7 +225079,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:319: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224354,7 +225096,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224377,7 +225119,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224391,7 +225133,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:319: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224408,7 +225150,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224431,7 +225173,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224443,7 +225185,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:319: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224460,7 +225202,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224482,7 +225224,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224494,7 +225236,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:319: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224511,7 +225253,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224534,7 +225276,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224548,7 +225290,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:319: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224565,7 +225307,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224589,7 +225331,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224603,7 +225345,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:319: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224620,7 +225362,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224646,7 +225388,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224660,7 +225402,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:319: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224677,7 +225419,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224699,7 +225441,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:319: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a"
 at_fn_check_prepare_trace "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224714,7 +225456,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:319: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:319"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224731,7 +225473,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224753,7 +225495,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:320"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224767,7 +225509,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:320: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:320"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224784,7 +225526,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224807,7 +225549,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:320"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224821,7 +225563,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:320: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:320"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224838,7 +225580,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224860,7 +225602,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:320"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named a
@@ -224874,7 +225616,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:320: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:320"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224891,7 +225633,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224913,7 +225655,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:320"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br bond0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224927,7 +225669,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:320: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:320"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224944,7 +225686,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224966,7 +225708,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:321"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -224982,7 +225724,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:321: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:321"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -224999,7 +225741,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225021,7 +225763,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:321"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named a
@@ -225035,7 +225777,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:321: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:321"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225052,7 +225794,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225074,7 +225816,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:321"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225088,7 +225830,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:321: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:321"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225105,7 +225847,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225126,7 +225868,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:321"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225140,7 +225882,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:321: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:321"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225157,7 +225899,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225178,7 +225920,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:321"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a3
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225192,7 +225934,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:321: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:321"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225209,7 +225951,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225230,7 +225972,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:322: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:322"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225247,7 +225989,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225263,13 +226005,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1548
-#AT_START_1549
-at_fn_group_banner 1549 'ovs-vsctl.at:325' \
+#AT_STOP_1551
+#AT_START_1552
+at_fn_group_banner 1552 'ovs-vsctl.at:325' \
   "add-br a b, add-port a a1, add-port b b1, del-port a a1" "" 92
 at_xfail=no
 (
-  $as_echo "1549. $at_setup_line: testing $at_desc ..."
+  $as_echo "1552. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -225278,7 +226020,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:327: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:327"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225299,7 +226041,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225312,7 +226054,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:327: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:327"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225337,7 +226079,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-port b b1
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket del-port a a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225351,7 +226093,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:328: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:328"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225368,7 +226110,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225390,7 +226132,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:336"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-port b b1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225402,7 +226144,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:336: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:336"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225419,7 +226161,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225441,7 +226183,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:338"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket del-port a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: cannot delete port a because it is the local port for bridge a (deleting this port requires deleting the entire bridge)
@@ -225455,7 +226197,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:338: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:338"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225472,7 +226214,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225494,7 +226236,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:342"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --if-exists del-port a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225506,7 +226248,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:342: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:342"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225523,7 +226265,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225545,7 +226287,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:344"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-port a b1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"--may-exist add-port a b1\" but b1 is actually attached to bridge b
@@ -225559,7 +226301,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:344: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:344"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225576,7 +226318,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225598,7 +226340,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225613,7 +226355,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225630,7 +226372,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225653,7 +226395,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225667,7 +226409,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225684,7 +226426,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225707,7 +226449,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225719,7 +226461,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225736,7 +226478,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225757,7 +226499,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225769,7 +226511,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225786,7 +226528,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225808,7 +226550,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225820,7 +226562,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225837,7 +226579,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225860,7 +226602,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225874,7 +226616,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225891,7 +226633,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225915,7 +226657,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225929,7 +226671,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225946,7 +226688,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -225972,7 +226714,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -225986,7 +226728,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226003,7 +226745,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226025,7 +226767,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a"
 at_fn_check_prepare_trace "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226040,7 +226782,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226057,7 +226799,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226078,7 +226820,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226092,7 +226834,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226109,7 +226851,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226133,7 +226875,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226147,7 +226889,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226164,7 +226906,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226190,7 +226932,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226204,7 +226946,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226221,7 +226963,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226243,7 +226985,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent b -- br-to-vlan b"
 at_fn_check_prepare_trace "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent b -- br-to-vlan b
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226258,7 +227000,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:348: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:348"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226275,7 +227017,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226297,7 +227039,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:349"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226309,7 +227051,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:349: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:349"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226326,7 +227068,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226349,7 +227091,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:349"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226363,7 +227105,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:349: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:349"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226380,7 +227122,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226402,7 +227144,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:349"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named a
@@ -226416,7 +227158,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:349: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:349"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226433,7 +227175,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226456,7 +227198,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:350"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226468,7 +227210,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:350: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:350"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226485,7 +227227,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226507,7 +227249,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:350"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named a
@@ -226521,7 +227263,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:350: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:350"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226538,7 +227280,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226561,7 +227303,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:351"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226575,7 +227317,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:351: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:351"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226592,7 +227334,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226615,7 +227357,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:351"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226629,7 +227371,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:351: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:351"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226646,7 +227388,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226668,7 +227410,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:351"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named b
@@ -226682,7 +227424,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:351: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:351"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226699,7 +227441,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226721,7 +227463,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:351"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br b1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226735,7 +227477,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:351: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:351"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226752,7 +227494,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226774,7 +227516,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:352"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226788,7 +227530,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:352: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:352"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226805,7 +227547,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226827,7 +227569,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:352"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named b
@@ -226841,7 +227583,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:352: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:352"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226858,7 +227600,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226880,7 +227622,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:352"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br b1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -226894,7 +227636,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:352: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:352"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226911,7 +227653,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226932,7 +227674,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:353: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:353"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226949,7 +227691,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -226965,13 +227707,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1549
-#AT_START_1550
-at_fn_group_banner 1550 'ovs-vsctl.at:356' \
+#AT_STOP_1552
+#AT_START_1553
+at_fn_group_banner 1553 'ovs-vsctl.at:356' \
   "add-br a, add-bond a bond0 a1 a2 a3, del-port bond0" "" 92
 at_xfail=no
 (
-  $as_echo "1550. $at_setup_line: testing $at_desc ..."
+  $as_echo "1553. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -226980,7 +227722,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:358: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:358"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227001,7 +227743,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227014,7 +227756,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:358: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:358"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227027,7 +227769,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:359: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- add-br a -- add-bond a bond0 a1 a2 a3 tag=9 -- get Port bond0 tag -- del-port bond0"
 at_fn_check_prepare_trace "ovs-vsctl.at:359"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- add-br a -- add-bond a bond0 a1 a2 a3 tag=9 -- get Port bond0 tag -- del-port bond0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227044,7 +227786,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:359: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:359"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227061,7 +227803,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227083,7 +227825,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227097,7 +227839,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:368: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227114,7 +227856,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227137,7 +227879,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227151,7 +227893,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:368: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227168,7 +227910,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227191,7 +227933,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227203,7 +227945,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:368: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227220,7 +227962,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227242,7 +227984,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227254,7 +227996,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:368: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227271,7 +228013,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227294,7 +228036,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227308,7 +228050,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:368: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227325,7 +228067,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227349,7 +228091,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227363,7 +228105,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:368: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227380,7 +228122,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227406,7 +228148,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227420,7 +228162,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:368: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227437,7 +228179,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227459,7 +228201,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:368: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a"
 at_fn_check_prepare_trace "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227474,7 +228216,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:368: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:368"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227491,7 +228233,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227513,7 +228255,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:369"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227525,7 +228267,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:369: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:369"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227542,7 +228284,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227565,7 +228307,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:369"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227579,7 +228321,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:369: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:369"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227596,7 +228338,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227618,7 +228360,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:369"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named a
@@ -227632,7 +228374,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:369: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:369"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227649,7 +228391,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227671,7 +228413,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:370: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:370"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227688,7 +228430,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227704,13 +228446,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1550
-#AT_START_1551
-at_fn_group_banner 1551 'ovs-vsctl.at:373' \
+#AT_STOP_1553
+#AT_START_1554
+at_fn_group_banner 1554 'ovs-vsctl.at:373' \
   "external IDs" "                                   " 92
 at_xfail=no
 (
-  $as_echo "1551. $at_setup_line: testing $at_desc ..."
+  $as_echo "1554. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -227719,7 +228461,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:375: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:375"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227740,7 +228482,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227753,7 +228495,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:375: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:375"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227802,7 +228544,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- get interface a2 external-ids
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- get interface a3 external-ids
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227833,7 +228575,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:376: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:376"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227850,7 +228592,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227870,7 +228612,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:413: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-get-external-id a -- get port a1 external-ids -- get interface a2 external-ids -- get interface a3 external-ids"
 at_fn_check_prepare_trace "ovs-vsctl.at:413"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-get-external-id a -- get port a1 external-ids -- get interface a2 external-ids -- get interface a3 external-ids
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227887,7 +228629,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:413: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:413"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227904,7 +228646,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227926,7 +228668,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227940,7 +228682,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:423: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227957,7 +228699,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -227980,7 +228722,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -227994,7 +228736,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:423: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228011,7 +228753,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228034,7 +228776,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228046,7 +228788,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:423: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228063,7 +228805,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228085,7 +228827,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228097,7 +228839,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:423: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228114,7 +228856,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228137,7 +228879,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228151,7 +228893,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:423: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228168,7 +228910,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228192,7 +228934,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228206,7 +228948,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:423: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228223,7 +228965,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228249,7 +228991,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228263,7 +229005,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:423: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228280,7 +229022,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228302,7 +229044,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:423: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a"
 at_fn_check_prepare_trace "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228317,7 +229059,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:423: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:423"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228334,7 +229076,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228356,7 +229098,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:424"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228371,7 +229113,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:424: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:424"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228388,7 +229130,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228411,7 +229153,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:424"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228425,7 +229167,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:424: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:424"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228442,7 +229184,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228464,7 +229206,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:424"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named a
@@ -228478,7 +229220,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:424: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:424"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228495,7 +229237,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228517,7 +229259,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:424"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228531,7 +229273,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:424: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:424"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228548,7 +229290,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228569,7 +229311,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:424"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br bond0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228583,7 +229325,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:424: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:424"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228600,7 +229342,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228622,7 +229364,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:425"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228638,7 +229380,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:425: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:425"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228655,7 +229397,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228677,7 +229419,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:425"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named a
@@ -228691,7 +229433,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:425: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:425"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228708,7 +229450,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228730,7 +229472,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:425"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228744,7 +229486,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:425: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:425"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228761,7 +229503,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228782,7 +229524,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:425"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228796,7 +229538,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:425: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:425"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228813,7 +229555,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228834,7 +229576,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:425"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a3
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -228848,7 +229590,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:425: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:425"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228865,7 +229607,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228886,7 +229628,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:426: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:426"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228903,7 +229645,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228919,13 +229661,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1551
-#AT_START_1552
-at_fn_group_banner 1552 'ovs-vsctl.at:429' \
+#AT_STOP_1554
+#AT_START_1555
+at_fn_group_banner 1555 'ovs-vsctl.at:429' \
   "controllers" "                                    " 92
 at_xfail=no
 (
-  $as_echo "1552. $at_setup_line: testing $at_desc ..."
+  $as_echo "1555. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -228934,7 +229676,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:431: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:431"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228955,7 +229697,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228968,7 +229710,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:431: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:431"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -228981,7 +229723,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:432: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- add-br br0 -- get-controller br0 -- set-controller br0 tcp:4.5.6.7 -- get-controller br0 -- del-controller br0 -- get-controller br0 -- set-controller br0 tcp:8.9.10.11 tcp:5.4.3.2 -- get-controller br0"
 at_fn_check_prepare_trace "ovs-vsctl.at:432"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- add-br br0 -- get-controller br0 -- set-controller br0 tcp:4.5.6.7 -- get-controller br0 -- del-controller br0 -- get-controller br0 -- set-controller br0 tcp:8.9.10.11 tcp:5.4.3.2 -- get-controller br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229002,7 +229744,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:432: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:432"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229019,7 +229761,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229040,7 +229782,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:452: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:452"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229057,7 +229799,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229073,13 +229815,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1552
-#AT_START_1553
-at_fn_group_banner 1553 'ovs-vsctl.at:559' \
+#AT_STOP_1555
+#AT_START_1556
+at_fn_group_banner 1556 'ovs-vsctl.at:559' \
   "simple fake bridge (VLAN 9)" "                    " 93
 at_xfail=no
 (
-  $as_echo "1553. $at_setup_line: testing $at_desc ..."
+  $as_echo "1556. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -229088,7 +229830,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:559"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229109,7 +229851,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229122,7 +229864,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229149,7 +229891,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xenbr0 9
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi1 eth0.9
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229161,7 +229903,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229178,7 +229920,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229200,7 +229942,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"--may-exist add-br xapi1\" but xapi1 is a VLAN bridge for VLAN 9
@@ -229214,7 +229956,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229231,7 +229973,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229253,7 +229995,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xxx 9
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"--may-exist add-br xapi1 xxx 9\" but xapi1 has the wrong parent xenbr0
@@ -229267,7 +230009,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229284,7 +230026,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229306,7 +230048,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xenbr0 10
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"--may-exist add-br xapi1 xenbr0 10\" but xapi1 is a VLAN bridge for the wrong VLAN 9
@@ -229320,7 +230062,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229337,7 +230079,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229359,7 +230101,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br dup xenbr0 9
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: bridge xenbr0 already has a child VLAN bridge xapi1 on VLAN 9
@@ -229373,7 +230115,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229390,7 +230132,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229412,7 +230154,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229427,7 +230169,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229444,7 +230186,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229467,7 +230209,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229481,7 +230223,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229498,7 +230240,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229521,7 +230263,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229533,7 +230275,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229550,7 +230292,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229571,7 +230313,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229583,7 +230325,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229600,7 +230342,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229622,7 +230364,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229634,7 +230376,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229651,7 +230393,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229674,7 +230416,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229688,7 +230430,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229705,7 +230447,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229729,7 +230471,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229743,7 +230485,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229760,7 +230502,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229786,7 +230528,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229800,7 +230542,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229817,7 +230559,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229839,7 +230581,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi1 -- br-to-vlan xapi1"
 at_fn_check_prepare_trace "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi1 -- br-to-vlan xapi1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229854,7 +230596,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229871,7 +230613,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229892,7 +230634,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229906,7 +230648,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229923,7 +230665,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229947,7 +230689,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -229961,7 +230703,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -229978,7 +230720,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230004,7 +230746,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230018,7 +230760,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230035,7 +230777,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230057,7 +230799,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xenbr0 -- br-to-vlan xenbr0"
 at_fn_check_prepare_trace "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xenbr0 -- br-to-vlan xenbr0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230072,7 +230814,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230089,7 +230831,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230111,7 +230853,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230125,7 +230867,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230142,7 +230884,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230165,7 +230907,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230179,7 +230921,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230196,7 +230938,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230218,7 +230960,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xenbr0
@@ -230232,7 +230974,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230249,7 +230991,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230271,7 +231013,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230285,7 +231027,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230302,7 +231044,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230324,7 +231066,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230338,7 +231080,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230355,7 +231097,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230377,7 +231119,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xenbr0
@@ -230391,7 +231133,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230408,7 +231150,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230430,7 +231172,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230444,7 +231186,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230461,7 +231203,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230483,7 +231225,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230497,7 +231239,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230514,7 +231256,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230537,7 +231279,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230551,7 +231293,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230568,7 +231310,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230590,7 +231332,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xapi1
@@ -230604,7 +231346,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230621,7 +231363,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230643,7 +231385,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br eth0.9
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230657,7 +231399,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230674,7 +231416,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230696,7 +231438,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230710,7 +231452,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230727,7 +231469,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230749,7 +231491,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xapi1
@@ -230763,7 +231505,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230780,7 +231522,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230802,7 +231544,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth0.9
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230816,7 +231558,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230833,7 +231575,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230854,7 +231596,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230871,7 +231613,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230887,13 +231629,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1553
-#AT_START_1554
-at_fn_group_banner 1554 'ovs-vsctl.at:559' \
+#AT_STOP_1556
+#AT_START_1557
+at_fn_group_banner 1557 'ovs-vsctl.at:559' \
   "list bridges -- real and fake (VLAN 9)" "         " 93
 at_xfail=no
 (
-  $as_echo "1554. $at_setup_line: testing $at_desc ..."
+  $as_echo "1557. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -230902,7 +231644,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:559"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230923,7 +231665,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230936,7 +231678,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230963,7 +231705,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xenbr0 9
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi1 eth0.9
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -230975,7 +231717,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -230992,7 +231734,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231014,7 +231756,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231028,7 +231770,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231045,7 +231787,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231067,7 +231809,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- -- --real list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231081,7 +231823,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231098,7 +231840,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231120,7 +231862,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- -- --fake list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231134,7 +231876,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231151,7 +231893,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231172,7 +231914,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231189,7 +231931,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231205,13 +231947,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1554
-#AT_START_1555
-at_fn_group_banner 1555 'ovs-vsctl.at:559' \
+#AT_STOP_1557
+#AT_START_1558
+at_fn_group_banner 1558 'ovs-vsctl.at:559' \
   "simple fake bridge + del-br fake bridge (VLAN 9)" "" 93
 at_xfail=no
 (
-  $as_echo "1555. $at_setup_line: testing $at_desc ..."
+  $as_echo "1558. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -231220,7 +231962,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:559"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231241,7 +231983,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231254,7 +231996,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231281,7 +232023,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xenbr0 9
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi1 eth0.9
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231293,7 +232035,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231310,7 +232052,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231332,7 +232074,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket del-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231344,7 +232086,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231361,7 +232103,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231383,7 +232125,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231397,7 +232139,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231414,7 +232156,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231437,7 +232179,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231451,7 +232193,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231468,7 +232210,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231491,7 +232233,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231503,7 +232245,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231520,7 +232262,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231542,7 +232284,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231554,7 +232296,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231571,7 +232313,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231594,7 +232336,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231608,7 +232350,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231625,7 +232367,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231649,7 +232391,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231663,7 +232405,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231680,7 +232422,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231706,7 +232448,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231720,7 +232462,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231737,7 +232479,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231759,7 +232501,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xenbr0 -- br-to-vlan xenbr0"
 at_fn_check_prepare_trace "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xenbr0 -- br-to-vlan xenbr0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231774,7 +232516,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231791,7 +232533,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231813,7 +232555,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231827,7 +232569,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231844,7 +232586,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231867,7 +232609,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231881,7 +232623,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231898,7 +232640,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231920,7 +232662,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xenbr0
@@ -231934,7 +232676,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231951,7 +232693,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -231973,7 +232715,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -231987,7 +232729,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232004,7 +232746,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232026,7 +232768,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232040,7 +232782,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232057,7 +232799,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232079,7 +232821,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xenbr0
@@ -232093,7 +232835,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232110,7 +232852,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232132,7 +232874,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232146,7 +232888,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232163,7 +232905,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232184,7 +232926,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232201,7 +232943,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232217,13 +232959,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1555
-#AT_START_1556
-at_fn_group_banner 1556 'ovs-vsctl.at:559' \
+#AT_STOP_1558
+#AT_START_1559
+at_fn_group_banner 1559 'ovs-vsctl.at:559' \
   "simple fake bridge + del-br real bridge (VLAN 9)" "" 93
 at_xfail=no
 (
-  $as_echo "1556. $at_setup_line: testing $at_desc ..."
+  $as_echo "1559. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -232232,7 +232974,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:559"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232253,7 +232995,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232266,7 +233008,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232293,7 +233035,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xenbr0 9
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi1 eth0.9
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232305,7 +233047,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232322,7 +233064,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232344,7 +233086,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket del-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232356,7 +233098,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232373,7 +233115,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232395,7 +233137,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232407,7 +233149,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232424,7 +233166,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232447,7 +233189,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232461,7 +233203,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232478,7 +233220,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232502,7 +233244,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232514,7 +233256,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232531,7 +233273,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232554,7 +233296,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232571,7 +233313,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232587,13 +233329,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1556
-#AT_START_1557
-at_fn_group_banner 1557 'ovs-vsctl.at:559' \
+#AT_STOP_1559
+#AT_START_1560
+at_fn_group_banner 1560 'ovs-vsctl.at:559' \
   "simple fake bridge + external IDs (VLAN 9)" "     " 93
 at_xfail=no
 (
-  $as_echo "1557. $at_setup_line: testing $at_desc ..."
+  $as_echo "1560. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -232602,7 +233344,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:559"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232623,7 +233365,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232636,7 +233378,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232663,7 +233405,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xenbr0 9
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi1 eth0.9
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232675,7 +233417,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232692,7 +233434,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232712,7 +233454,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-set-external-id xenbr0 key0 value0 -- br-set-external-id xapi1 key1 value1 -- br-get-external-id xenbr0 -- br-get-external-id xenbr0 key0 -- br-get-external-id xapi1 -- br-get-external-id xapi1 key1"
 at_fn_check_prepare_trace "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-set-external-id xenbr0 key0 value0 -- br-set-external-id xapi1 key1 value1 -- br-get-external-id xenbr0 -- br-get-external-id xenbr0 key0 -- br-get-external-id xapi1 -- br-get-external-id xapi1 key1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232731,7 +233473,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232748,7 +233490,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232770,7 +233512,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232785,7 +233527,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232802,7 +233544,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232825,7 +233567,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232839,7 +233581,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232856,7 +233598,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232879,7 +233621,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232891,7 +233633,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232908,7 +233650,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232929,7 +233671,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232941,7 +233683,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232958,7 +233700,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -232980,7 +233722,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -232992,7 +233734,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233009,7 +233751,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233032,7 +233774,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233046,7 +233788,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233063,7 +233805,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233087,7 +233829,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233101,7 +233843,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233118,7 +233860,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233144,7 +233886,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233158,7 +233900,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233175,7 +233917,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233197,7 +233939,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi1 -- br-to-vlan xapi1"
 at_fn_check_prepare_trace "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi1 -- br-to-vlan xapi1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233212,7 +233954,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233229,7 +233971,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233250,7 +233992,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233264,7 +234006,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233281,7 +234023,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233305,7 +234047,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233319,7 +234061,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233336,7 +234078,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233362,7 +234104,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233376,7 +234118,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233393,7 +234135,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233415,7 +234157,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xenbr0 -- br-to-vlan xenbr0"
 at_fn_check_prepare_trace "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xenbr0 -- br-to-vlan xenbr0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233430,7 +234172,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233447,7 +234189,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233469,7 +234211,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233483,7 +234225,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233500,7 +234242,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233523,7 +234265,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233537,7 +234279,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233554,7 +234296,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233576,7 +234318,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xenbr0
@@ -233590,7 +234332,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233607,7 +234349,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233629,7 +234371,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233643,7 +234385,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233660,7 +234402,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233682,7 +234424,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233696,7 +234438,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233713,7 +234455,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233735,7 +234477,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xenbr0
@@ -233749,7 +234491,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233766,7 +234508,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233788,7 +234530,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233802,7 +234544,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233819,7 +234561,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233841,7 +234583,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233855,7 +234597,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233872,7 +234614,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233895,7 +234637,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -233909,7 +234651,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233926,7 +234668,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233948,7 +234690,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xapi1
@@ -233962,7 +234704,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -233979,7 +234721,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234001,7 +234743,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br eth0.9
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -234015,7 +234757,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234032,7 +234774,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234054,7 +234796,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -234068,7 +234810,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234085,7 +234827,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234107,7 +234849,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xapi1
@@ -234121,7 +234863,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234138,7 +234880,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234160,7 +234902,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth0.9
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -234174,7 +234916,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234191,7 +234933,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234212,7 +234954,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234229,7 +234971,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234245,13 +234987,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1557
-#AT_START_1558
-at_fn_group_banner 1558 'ovs-vsctl.at:560' \
+#AT_STOP_1560
+#AT_START_1561
+at_fn_group_banner 1561 'ovs-vsctl.at:560' \
   "simple fake bridge (VLAN 0)" "                    " 94
 at_xfail=no
 (
-  $as_echo "1558. $at_setup_line: testing $at_desc ..."
+  $as_echo "1561. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -234260,7 +235002,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:560"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234281,7 +235023,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234294,7 +235036,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234321,7 +235063,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xenbr0 0
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi1 eth0.0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -234333,7 +235075,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234350,7 +235092,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234372,7 +235114,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"--may-exist add-br xapi1\" but xapi1 is a VLAN bridge for VLAN 0
@@ -234386,7 +235128,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234403,7 +235145,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234425,7 +235167,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xxx 0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"--may-exist add-br xapi1 xxx 0\" but xapi1 has the wrong parent xenbr0
@@ -234439,7 +235181,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234456,7 +235198,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234478,7 +235220,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xenbr0 10
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"--may-exist add-br xapi1 xenbr0 10\" but xapi1 is a VLAN bridge for the wrong VLAN 0
@@ -234492,7 +235234,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234509,7 +235251,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234531,7 +235273,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br dup xenbr0 0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: bridge xenbr0 already has a child VLAN bridge xapi1 on VLAN 0
@@ -234545,7 +235287,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234562,7 +235304,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234584,7 +235326,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -234599,7 +235341,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234616,7 +235358,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234639,7 +235381,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -234653,7 +235395,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234670,7 +235412,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234693,7 +235435,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -234705,7 +235447,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234722,7 +235464,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234743,7 +235485,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -234755,7 +235497,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234772,7 +235514,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234794,7 +235536,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -234806,7 +235548,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234823,7 +235565,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234846,7 +235588,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -234860,7 +235602,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234877,7 +235619,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234901,7 +235643,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -234915,7 +235657,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234932,7 +235674,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234958,7 +235700,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -234972,7 +235714,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -234989,7 +235731,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235011,7 +235753,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi1 -- br-to-vlan xapi1"
 at_fn_check_prepare_trace "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi1 -- br-to-vlan xapi1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235026,7 +235768,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235043,7 +235785,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235064,7 +235806,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235078,7 +235820,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235095,7 +235837,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235119,7 +235861,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235133,7 +235875,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235150,7 +235892,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235176,7 +235918,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235190,7 +235932,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235207,7 +235949,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235229,7 +235971,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xenbr0 -- br-to-vlan xenbr0"
 at_fn_check_prepare_trace "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xenbr0 -- br-to-vlan xenbr0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235244,7 +235986,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235261,7 +236003,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235283,7 +236025,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235297,7 +236039,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235314,7 +236056,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235337,7 +236079,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235351,7 +236093,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235368,7 +236110,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235390,7 +236132,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xenbr0
@@ -235404,7 +236146,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235421,7 +236163,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235443,7 +236185,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235457,7 +236199,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235474,7 +236216,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235496,7 +236238,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235510,7 +236252,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235527,7 +236269,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235549,7 +236291,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xenbr0
@@ -235563,7 +236305,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235580,7 +236322,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235602,7 +236344,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235616,7 +236358,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235633,7 +236375,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235655,7 +236397,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235669,7 +236411,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235686,7 +236428,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235709,7 +236451,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235723,7 +236465,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235740,7 +236482,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235762,7 +236504,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xapi1
@@ -235776,7 +236518,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235793,7 +236535,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235815,7 +236557,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br eth0.0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235829,7 +236571,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235846,7 +236588,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235868,7 +236610,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235882,7 +236624,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235899,7 +236641,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235921,7 +236663,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xapi1
@@ -235935,7 +236677,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235952,7 +236694,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -235974,7 +236716,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth0.0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -235988,7 +236730,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236005,7 +236747,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236026,7 +236768,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236043,7 +236785,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236059,13 +236801,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1558
-#AT_START_1559
-at_fn_group_banner 1559 'ovs-vsctl.at:560' \
+#AT_STOP_1561
+#AT_START_1562
+at_fn_group_banner 1562 'ovs-vsctl.at:560' \
   "list bridges -- real and fake (VLAN 0)" "         " 94
 at_xfail=no
 (
-  $as_echo "1559. $at_setup_line: testing $at_desc ..."
+  $as_echo "1562. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -236074,7 +236816,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:560"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236095,7 +236837,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236108,7 +236850,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236135,7 +236877,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xenbr0 0
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi1 eth0.0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236147,7 +236889,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236164,7 +236906,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236186,7 +236928,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236200,7 +236942,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236217,7 +236959,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236239,7 +236981,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- -- --real list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236253,7 +236995,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236270,7 +237012,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236292,7 +237034,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- -- --fake list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236306,7 +237048,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236323,7 +237065,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236344,7 +237086,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236361,7 +237103,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236377,13 +237119,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1559
-#AT_START_1560
-at_fn_group_banner 1560 'ovs-vsctl.at:560' \
+#AT_STOP_1562
+#AT_START_1563
+at_fn_group_banner 1563 'ovs-vsctl.at:560' \
   "simple fake bridge + del-br fake bridge (VLAN 0)" "" 94
 at_xfail=no
 (
-  $as_echo "1560. $at_setup_line: testing $at_desc ..."
+  $as_echo "1563. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -236392,7 +237134,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:560"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236413,7 +237155,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236426,7 +237168,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236453,7 +237195,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xenbr0 0
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi1 eth0.0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236465,7 +237207,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236482,7 +237224,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236504,7 +237246,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket del-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236516,7 +237258,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236533,7 +237275,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236555,7 +237297,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236569,7 +237311,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236586,7 +237328,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236609,7 +237351,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236623,7 +237365,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236640,7 +237382,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236663,7 +237405,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236675,7 +237417,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236692,7 +237434,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236714,7 +237456,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236726,7 +237468,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236743,7 +237485,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236766,7 +237508,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236780,7 +237522,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236797,7 +237539,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236821,7 +237563,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236835,7 +237577,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236852,7 +237594,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236878,7 +237620,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236892,7 +237634,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236909,7 +237651,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236931,7 +237673,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xenbr0 -- br-to-vlan xenbr0"
 at_fn_check_prepare_trace "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xenbr0 -- br-to-vlan xenbr0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236946,7 +237688,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236963,7 +237705,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -236985,7 +237727,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -236999,7 +237741,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237016,7 +237758,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237039,7 +237781,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -237053,7 +237795,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237070,7 +237812,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237092,7 +237834,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xenbr0
@@ -237106,7 +237848,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237123,7 +237865,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237145,7 +237887,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -237159,7 +237901,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237176,7 +237918,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237198,7 +237940,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -237212,7 +237954,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237229,7 +237971,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237251,7 +237993,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xenbr0
@@ -237265,7 +238007,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237282,7 +238024,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237304,7 +238046,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -237318,7 +238060,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237335,7 +238077,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237356,7 +238098,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237373,7 +238115,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237389,13 +238131,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1560
-#AT_START_1561
-at_fn_group_banner 1561 'ovs-vsctl.at:560' \
+#AT_STOP_1563
+#AT_START_1564
+at_fn_group_banner 1564 'ovs-vsctl.at:560' \
   "simple fake bridge + del-br real bridge (VLAN 0)" "" 94
 at_xfail=no
 (
-  $as_echo "1561. $at_setup_line: testing $at_desc ..."
+  $as_echo "1564. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -237404,7 +238146,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:560"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237425,7 +238167,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237438,7 +238180,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237465,7 +238207,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xenbr0 0
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi1 eth0.0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -237477,7 +238219,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237494,7 +238236,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237516,7 +238258,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket del-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -237528,7 +238270,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237545,7 +238287,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237567,7 +238309,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -237579,7 +238321,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237596,7 +238338,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237619,7 +238361,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -237633,7 +238375,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237650,7 +238392,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237674,7 +238416,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -237686,7 +238428,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237703,7 +238445,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237726,7 +238468,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237743,7 +238485,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237759,13 +238501,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1561
-#AT_START_1562
-at_fn_group_banner 1562 'ovs-vsctl.at:560' \
+#AT_STOP_1564
+#AT_START_1565
+at_fn_group_banner 1565 'ovs-vsctl.at:560' \
   "simple fake bridge + external IDs (VLAN 0)" "     " 94
 at_xfail=no
 (
-  $as_echo "1562. $at_setup_line: testing $at_desc ..."
+  $as_echo "1565. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -237774,7 +238516,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:560"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237795,7 +238537,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237808,7 +238550,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237835,7 +238577,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --may-exist add-br xapi1 xenbr0 0
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi1 eth0.0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -237847,7 +238589,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237864,7 +238606,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237884,7 +238626,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-set-external-id xenbr0 key0 value0 -- br-set-external-id xapi1 key1 value1 -- br-get-external-id xenbr0 -- br-get-external-id xenbr0 key0 -- br-get-external-id xapi1 -- br-get-external-id xapi1 key1"
 at_fn_check_prepare_trace "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-set-external-id xenbr0 key0 value0 -- br-set-external-id xapi1 key1 value1 -- br-get-external-id xenbr0 -- br-get-external-id xenbr0 key0 -- br-get-external-id xapi1 -- br-get-external-id xapi1 key1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -237903,7 +238645,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237920,7 +238662,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237942,7 +238684,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -237957,7 +238699,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237974,7 +238716,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -237997,7 +238739,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238011,7 +238753,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238028,7 +238770,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238051,7 +238793,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238063,7 +238805,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238080,7 +238822,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238101,7 +238843,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238113,7 +238855,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238130,7 +238872,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238152,7 +238894,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238164,7 +238906,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238181,7 +238923,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238204,7 +238946,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238218,7 +238960,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238235,7 +238977,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238259,7 +239001,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238273,7 +239015,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238290,7 +239032,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238316,7 +239058,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238330,7 +239072,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238347,7 +239089,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238369,7 +239111,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi1 -- br-to-vlan xapi1"
 at_fn_check_prepare_trace "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi1 -- br-to-vlan xapi1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238384,7 +239126,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238401,7 +239143,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238422,7 +239164,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238436,7 +239178,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238453,7 +239195,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238477,7 +239219,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238491,7 +239233,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238508,7 +239250,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238534,7 +239276,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238548,7 +239290,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238565,7 +239307,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238587,7 +239329,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xenbr0 -- br-to-vlan xenbr0"
 at_fn_check_prepare_trace "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xenbr0 -- br-to-vlan xenbr0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238602,7 +239344,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238619,7 +239361,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238641,7 +239383,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238655,7 +239397,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238672,7 +239414,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238695,7 +239437,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238709,7 +239451,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238726,7 +239468,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238748,7 +239490,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xenbr0
@@ -238762,7 +239504,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238779,7 +239521,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238801,7 +239543,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238815,7 +239557,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238832,7 +239574,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238854,7 +239596,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238868,7 +239610,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238885,7 +239627,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238907,7 +239649,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xenbr0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xenbr0
@@ -238921,7 +239663,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238938,7 +239680,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238960,7 +239702,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -238974,7 +239716,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -238991,7 +239733,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239013,7 +239755,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239027,7 +239769,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239044,7 +239786,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239067,7 +239809,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239081,7 +239823,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239098,7 +239840,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239120,7 +239862,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xapi1
@@ -239134,7 +239876,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239151,7 +239893,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239173,7 +239915,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br eth0.0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239187,7 +239929,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239204,7 +239946,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239226,7 +239968,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239240,7 +239982,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239257,7 +239999,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239279,7 +240021,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xapi1
@@ -239293,7 +240035,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239310,7 +240052,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239332,7 +240074,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth0.0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239346,7 +240088,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239363,7 +240105,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239384,7 +240126,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:560: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:560"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239401,7 +240143,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239417,13 +240159,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1562
-#AT_START_1563
-at_fn_group_banner 1563 'ovs-vsctl.at:572' \
+#AT_STOP_1565
+#AT_START_1566
+at_fn_group_banner 1566 'ovs-vsctl.at:572' \
   "fake bridge on bond" "                            " 94
 at_xfail=no
 (
-  $as_echo "1563. $at_setup_line: testing $at_desc ..."
+  $as_echo "1566. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -239432,7 +240174,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:574: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:574"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239453,7 +240195,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239466,7 +240208,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:574: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:574"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239487,7 +240229,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br xapi2 xapi1 11
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi2 bond0.11
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239499,7 +240241,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:575: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:575"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239516,7 +240258,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239538,7 +240280,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239553,7 +240295,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239570,7 +240312,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239593,7 +240335,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239607,7 +240349,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239624,7 +240366,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239647,7 +240389,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239659,7 +240401,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239676,7 +240418,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239697,7 +240439,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xapi2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239709,7 +240451,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239726,7 +240468,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239748,7 +240490,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239760,7 +240502,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239777,7 +240519,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239800,7 +240542,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239814,7 +240556,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239831,7 +240573,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239855,7 +240597,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239869,7 +240611,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239886,7 +240628,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239912,7 +240654,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239926,7 +240668,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239943,7 +240685,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239965,7 +240707,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi1 -- br-to-vlan xapi1"
 at_fn_check_prepare_trace "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi1 -- br-to-vlan xapi1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -239980,7 +240722,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -239997,7 +240739,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240018,7 +240760,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xapi2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240032,7 +240774,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240049,7 +240791,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240073,7 +240815,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xapi2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240087,7 +240829,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240104,7 +240846,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240130,7 +240872,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xapi2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240144,7 +240886,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240161,7 +240903,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240183,7 +240925,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi2 -- br-to-vlan xapi2"
 at_fn_check_prepare_trace "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi2 -- br-to-vlan xapi2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240198,7 +240940,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:576: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:576"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240215,7 +240957,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240237,7 +240979,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:577"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240251,7 +240993,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:577: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:577"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240268,7 +241010,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240291,7 +241033,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:577"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240305,7 +241047,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:577: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:577"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240322,7 +241064,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240344,7 +241086,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:577"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xapi1
@@ -240358,7 +241100,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:577: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:577"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240375,7 +241117,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240397,7 +241139,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:577"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br bond0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240411,7 +241153,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:577: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:577"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240428,7 +241170,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240450,7 +241192,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:578"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240465,7 +241207,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:578: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:578"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240482,7 +241224,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240504,7 +241246,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:578"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xapi1
@@ -240518,7 +241260,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:578: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:578"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240535,7 +241277,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240557,7 +241299,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:578"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240571,7 +241313,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:578: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:578"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240588,7 +241330,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240609,7 +241351,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:578"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240623,7 +241365,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:578: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:578"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240640,7 +241382,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240662,7 +241404,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:579"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xapi2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240676,7 +241418,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:579: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:579"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240693,7 +241435,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240716,7 +241458,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:579"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xapi2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240730,7 +241472,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:579: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:579"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240747,7 +241489,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240769,7 +241511,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:579"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xapi2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xapi2
@@ -240783,7 +241525,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:579: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:579"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240800,7 +241542,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240822,7 +241564,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:579"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br bond0.11
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240836,7 +241578,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:579: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:579"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240853,7 +241595,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240875,7 +241617,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:580"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xapi2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240889,7 +241631,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:580: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:580"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240906,7 +241648,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240928,7 +241670,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:580"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xapi2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xapi2
@@ -240942,7 +241684,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:580: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:580"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240959,7 +241701,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -240981,7 +241723,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:580"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br bond0.11
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -240995,7 +241737,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:580: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:580"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241012,7 +241754,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241033,7 +241775,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:581: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:581"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241050,7 +241792,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241066,13 +241808,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1563
-#AT_START_1564
-at_fn_group_banner 1564 'ovs-vsctl.at:584' \
+#AT_STOP_1566
+#AT_START_1567
+at_fn_group_banner 1567 'ovs-vsctl.at:584' \
   "fake bridge on bond + del-br fake bridge" "       " 94
 at_xfail=no
 (
-  $as_echo "1564. $at_setup_line: testing $at_desc ..."
+  $as_echo "1567. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -241081,7 +241823,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:586: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:586"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241102,7 +241844,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241115,7 +241857,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:586: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:586"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241136,7 +241878,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br xapi2 xapi1 11
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi2 bond0.11
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241148,7 +241890,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:587: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:587"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241165,7 +241907,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241187,7 +241929,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:588"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- del-br xapi2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241201,7 +241943,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:588: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:588"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241218,7 +241960,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241240,7 +241982,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241254,7 +241996,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:590: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241271,7 +242013,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241294,7 +242036,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241308,7 +242050,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:590: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241325,7 +242067,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241348,7 +242090,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241360,7 +242102,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:590: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241377,7 +242119,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241399,7 +242141,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241411,7 +242153,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:590: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241428,7 +242170,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241451,7 +242193,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241465,7 +242207,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:590: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241482,7 +242224,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241506,7 +242248,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241520,7 +242262,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:590: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241537,7 +242279,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241563,7 +242305,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241577,7 +242319,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:590: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241594,7 +242336,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241616,7 +242358,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:590: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi1 -- br-to-vlan xapi1"
 at_fn_check_prepare_trace "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent xapi1 -- br-to-vlan xapi1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241631,7 +242373,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:590: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:590"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241648,7 +242390,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241670,7 +242412,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:591"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241684,7 +242426,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:591: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:591"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241701,7 +242443,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241724,7 +242466,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:591"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241738,7 +242480,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:591: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:591"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241755,7 +242497,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241777,7 +242519,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:591"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named xapi1
@@ -241791,7 +242533,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:591: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:591"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241808,7 +242550,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241830,7 +242572,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:591"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br bond0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241844,7 +242586,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:591: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:591"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241861,7 +242603,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241883,7 +242625,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:592"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -241898,7 +242640,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:592: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:592"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241915,7 +242657,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241937,7 +242679,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:592"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named xapi1
@@ -241951,7 +242693,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:592: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:592"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241968,7 +242710,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -241990,7 +242732,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:592"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242004,7 +242746,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:592: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:592"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242021,7 +242763,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242042,7 +242784,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:592"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br eth1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242056,7 +242798,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:592: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:592"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242073,7 +242815,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242094,7 +242836,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:593: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:593"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242111,7 +242853,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242127,13 +242869,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1564
-#AT_START_1565
-at_fn_group_banner 1565 'ovs-vsctl.at:596' \
+#AT_STOP_1567
+#AT_START_1568
+at_fn_group_banner 1568 'ovs-vsctl.at:596' \
   "fake bridge on bond + del-br real bridge" "       " 94
 at_xfail=no
 (
-  $as_echo "1565. $at_setup_line: testing $at_desc ..."
+  $as_echo "1568. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -242142,7 +242884,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:598: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:598"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242163,7 +242905,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242176,7 +242918,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:598: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:598"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242197,7 +242939,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br xapi2 xapi1 11
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port xapi2 bond0.11
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242209,7 +242951,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:599: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:599"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242226,7 +242968,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242248,7 +242990,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:600"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket del-br xapi1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242263,7 +243005,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:601"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242275,7 +243017,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:601: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:601"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242292,7 +243034,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242315,7 +243057,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:601"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242329,7 +243071,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:601: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:601"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242346,7 +243088,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242370,7 +243112,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:601"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242382,7 +243124,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:601: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:601"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242399,7 +243141,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242422,7 +243164,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:602: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:602"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242439,7 +243181,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242455,13 +243197,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1565
-#AT_START_1566
-at_fn_group_banner 1566 'ovs-vsctl.at:608' \
+#AT_STOP_1568
+#AT_START_1569
+at_fn_group_banner 1569 'ovs-vsctl.at:608' \
   "managers" "                                       " 95
 at_xfail=no
 (
-  $as_echo "1566. $at_setup_line: testing $at_desc ..."
+  $as_echo "1569. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -242470,7 +243212,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:610: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:610"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242491,7 +243233,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242504,7 +243246,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:610: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:610"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242517,7 +243259,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:611: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- del-manager -- get-manager -- set-manager tcp:4.5.6.7 -- get-manager -- set-manager tcp:8.9.10.11 tcp:5.4.3.2 -- get-manager -- del-manager -- get-manager"
 at_fn_check_prepare_trace "ovs-vsctl.at:611"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- del-manager -- get-manager -- set-manager tcp:4.5.6.7 -- get-manager -- set-manager tcp:8.9.10.11 tcp:5.4.3.2 -- get-manager -- del-manager -- get-manager
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242538,7 +243280,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:611: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:611"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242555,7 +243297,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242576,7 +243318,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:628: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:628"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242593,7 +243335,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242609,13 +243351,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1566
-#AT_START_1567
-at_fn_group_banner 1567 'ovs-vsctl.at:634' \
+#AT_STOP_1569
+#AT_START_1570
+at_fn_group_banner 1570 'ovs-vsctl.at:634' \
   "database commands -- positive checks" "           " 96
 at_xfail=no
 (
-  $as_echo "1567. $at_setup_line: testing $at_desc ..."
+  $as_echo "1570. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -242624,7 +243366,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:636: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:636"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242645,7 +243387,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242658,7 +243400,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:636: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:636"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242671,7 +243413,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:637: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- --id=@br0 create bridge name=br123 -- set b br123 name=br0 -- set o . bridges=@br0"
 at_fn_check_prepare_trace "ovs-vsctl.at:637"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- --id=@br0 create bridge name=br123 -- set b br123 name=br0 -- set o . bridges=@br0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242683,7 +243425,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:637: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:637"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242700,7 +243442,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242725,7 +243467,7 @@
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list bridge
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket get bridge br0 _uuid
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242737,7 +243479,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:643: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:643"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242754,7 +243496,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242775,7 +243517,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:646: \${PERL} \$srcdir/uuidfilt.pl out1 out2"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovs-vsctl.at:646"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl out1 out2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242821,7 +243563,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:675"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --columns=fail_mode,name,datapath_type list bridge
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242843,7 +243585,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:682"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --columns=fail_mode,name,datapath_type find bridge
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242865,7 +243607,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:689"
 ( $at_check_trace;
   ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- --id=@br1 create bridge name=br1 datapath_type="foo" -- --id=@br2 create bridge name=br2 external-ids:bar=quux -- add o . bridges @br1 @br2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242877,7 +243619,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:689: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:689"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242894,7 +243636,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242916,7 +243658,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:694"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --columns=name find bridge datapath_type!=foo
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242932,7 +243674,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:697: sed -n '/./p' stdout | sort"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:697"
 ( $at_check_trace; sed -n '/./p' stdout | sort
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242958,7 +243700,7 @@
       'external-ids={"uuids"="9c45f225-a7cf-439d-976d-83db6271fda1"}' -- \
      add bridge br0 external_ids '"roles"="local; remote; cloud"'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -242970,7 +243712,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:701: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:701"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -242987,7 +243729,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243009,7 +243751,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:709"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- get bridge br0 other_config external-ids
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243023,7 +243765,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:709: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:709"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243040,7 +243782,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243062,7 +243804,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:712"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket get bridge br0 other_config:hwaddr -- --if-exists get bridge br0 other-config:nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243077,7 +243819,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:712: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:712"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243094,7 +243836,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243116,7 +243858,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:716"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket remove bridge br0 other_config hwaddr 'datapath_id=""' -- get bridge br0 other_config
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243130,7 +243872,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:716: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:716"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243147,7 +243889,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243169,7 +243911,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:719"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket remove bridge br0 other_config 'datapath_id="0123456789ab"' -- get bridge br0 other_config
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243183,7 +243925,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:719: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:719"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243200,7 +243942,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243222,7 +243964,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:722"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket clear bridge br0 external-ids -- get bridge br0 external_ids
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243236,7 +243978,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:722: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:722"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243253,7 +243995,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243273,7 +244015,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:725: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- destroy bridge br0 -- destroy bridge br1 -- destroy bridge br2 -- clear o . bridges"
 at_fn_check_prepare_trace "ovs-vsctl.at:725"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- destroy bridge br0 -- destroy bridge br1 -- destroy bridge br2 -- clear o . bridges
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243285,7 +244027,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:725: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:725"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243302,7 +244044,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243324,7 +244066,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:730"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list bridge
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243336,7 +244078,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:730: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:730"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243353,7 +244095,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243375,7 +244117,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:732"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --if-exists get bridge x datapath_id
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243387,7 +244129,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:732: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:732"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243404,7 +244146,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243426,7 +244168,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:734"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --if-exists list bridge x
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243438,7 +244180,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:734: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:734"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243455,7 +244197,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243477,7 +244219,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:736"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --if-exists set controller x connection_mode=standalone
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243489,7 +244231,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:736: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:736"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243506,7 +244248,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243528,7 +244270,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:738"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --if-exists remove netflow x targets '"1.2.3.4:567"'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243540,7 +244282,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:738: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:738"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243557,7 +244299,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243579,7 +244321,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:741"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --if-exists clear netflow x targets
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243591,7 +244333,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:741: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:741"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243608,7 +244350,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243629,7 +244371,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:744: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:744"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243646,7 +244388,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243662,13 +244404,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1567
-#AT_START_1568
-at_fn_group_banner 1568 'ovs-vsctl.at:747' \
+#AT_STOP_1570
+#AT_START_1571
+at_fn_group_banner 1571 'ovs-vsctl.at:747' \
   "database commands -- negative checks" "           " 96
 at_xfail=no
 (
-  $as_echo "1568. $at_setup_line: testing $at_desc ..."
+  $as_echo "1571. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -243677,7 +244419,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:749: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:749"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243698,7 +244440,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243711,7 +244453,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:749: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:749"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243725,7 +244467,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:751: ovs-vsctl --may-exist"
 at_fn_check_prepare_trace "ovs-vsctl.at:751"
 ( $at_check_trace; ovs-vsctl --may-exist
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: missing command name (use --help for help)
@@ -243739,7 +244481,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:751: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:751"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243756,7 +244498,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243776,7 +244518,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:754: ovs-vsctl --may-exist --"
 at_fn_check_prepare_trace "ovs-vsctl.at:754"
 ( $at_check_trace; ovs-vsctl --may-exist --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: missing command name (use --help for help)
@@ -243790,7 +244532,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:754: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:754"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243807,7 +244549,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243827,7 +244569,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:757: ovs-vsctl -- --may-exist"
 at_fn_check_prepare_trace "ovs-vsctl.at:757"
 ( $at_check_trace; ovs-vsctl -- --may-exist
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: missing command name (use --help for help)
@@ -243841,7 +244583,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:757: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:757"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243858,7 +244600,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243881,7 +244623,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:761"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br br0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243893,7 +244635,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:761: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:761"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243910,7 +244652,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243932,7 +244674,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:763"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br br1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243944,7 +244686,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:763: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:763"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243961,7 +244703,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -243983,7 +244725,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:765"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket set-controller br1 tcp:127.0.0.1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -243995,7 +244737,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:765: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:765"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244012,7 +244754,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244034,7 +244776,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:767"
 ( $at_check_trace;
     ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- --id=@n create netflow targets='"1.2.3.4:567"' -- set bridge br0 netflow=@n
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -244046,7 +244788,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:767: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:767"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244063,7 +244805,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244086,7 +244828,7 @@
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:772"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list netflow `cat netflow-uuid`
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -244098,7 +244840,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:772: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:772"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244115,7 +244857,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244135,7 +244877,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:774: \${PERL} \$srcdir/uuidfilt.pl netflow-uuid stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovs-vsctl.at:774"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl netflow-uuid stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244163,7 +244905,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:785"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list interx x
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: unknown table \"interx\"
@@ -244177,7 +244919,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:785: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:785"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244194,7 +244936,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244216,7 +244958,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:788"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list bridge x
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no row \"x\" in table Bridge
@@ -244230,7 +244972,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:788: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:788"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244247,7 +244989,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244269,7 +245011,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:791"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket get bridge x datapath_id
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no row \"x\" in table Bridge
@@ -244283,7 +245025,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:791: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:791"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244300,7 +245042,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244322,7 +245064,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:794"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket get bridge br0 d
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Bridge contains more than one column whose name matches \"d\"
@@ -244336,7 +245078,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:794: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:794"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244353,7 +245095,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244375,7 +245117,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:797"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket get bridge br0 x
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Bridge does not contain a column whose name matches \"x\"
@@ -244389,7 +245131,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:797: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:797"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244406,7 +245148,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244428,7 +245170,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:800"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket get bridge br0 :y=z
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: :y=z: missing column name
@@ -244442,7 +245184,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:800: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:800"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244459,7 +245201,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244481,7 +245223,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:803"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket get bridge br0 datapath_id:y=z
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: datapath_id:y=z: trailing garbage \"=z\" in argument
@@ -244495,7 +245237,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:803: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:803"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244512,7 +245254,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244534,7 +245276,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:806"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket set bridge br0 'datapath_id:y>=z'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: datapath_id:y>=z: argument does not end in \"=\" followed by a value.
@@ -244548,7 +245290,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:806: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:806"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244565,7 +245307,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244587,7 +245329,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:809"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket set controller x connection_mode=standalone
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no row \"x\" in table Controller
@@ -244601,7 +245343,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:809: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:809"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244618,7 +245360,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244640,7 +245382,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:812"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket wait-until bridge br0 datapath_id:y,z
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: datapath_id:y,z: argument does not end in \"=\", \"!=\", \"<\", \">\", \"<=\", \">=\", \"{=}\", \"{!=}\", \"{<}\", \"{>}\", \"{<=}\", or \"{>=}\" followed by a value.
@@ -244654,7 +245396,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:812: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:812"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244671,7 +245413,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244693,7 +245435,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:815"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket get bridge br0 datapath_id::
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: datapath_id::: trailing garbage \":\" in argument
@@ -244707,7 +245449,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:815: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:815"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244724,7 +245466,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244746,7 +245488,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:818"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket get bridge br0 datapath_id:x
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: cannot specify key to get for non-map column datapath_id
@@ -244760,7 +245502,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:818: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:818"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244777,7 +245519,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244799,7 +245541,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:821"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket get bridge br0 external_ids:x
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no key \"x\" in Bridge record \"br0\" column external_ids
@@ -244813,7 +245555,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:821: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:821"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244830,7 +245572,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244852,7 +245594,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:824"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket set bridge br0 flood_vlans=-1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: constraint violation: -1 is not in the valid range 0 to 4095 (inclusive)
@@ -244866,7 +245608,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:824: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:824"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244883,7 +245625,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244905,7 +245647,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:827"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket set bridge br0 flood_vlans=4096
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: constraint violation: 4096 is not in the valid range 0 to 4095 (inclusive)
@@ -244919,7 +245661,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:827: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:827"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244936,7 +245678,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244958,7 +245700,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:830"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket set c br1 'connection-mode=xyz'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: constraint violation: xyz is not one of the allowed values ([in-band, out-of-band])
@@ -244972,7 +245714,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:830: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:830"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -244989,7 +245731,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245011,7 +245753,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:833"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket set c br1 connection-mode:x=y
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: cannot specify key to set for non-map column connection_mode
@@ -245025,7 +245767,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:833: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:833"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245042,7 +245784,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245064,7 +245806,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:836"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add bridge br1 datapath_id x y
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"add\" operation would put 2 values in column datapath_id of table Bridge but the maximum number is 1
@@ -245078,7 +245820,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:836: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:836"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245095,7 +245837,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245117,7 +245859,7 @@
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:839"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket remove netflow `cat netflow-uuid` targets '"1.2.3.4:567"'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"remove\" operation would put 0 values in column targets of table NetFlow but the minimum number is 1
@@ -245131,7 +245873,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:839: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:839"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245148,7 +245890,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245170,7 +245912,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:842"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket remove netflow x targets '"1.2.3.4:567"'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no row \"x\" in table NetFlow
@@ -245184,7 +245926,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:842: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:842"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245201,7 +245943,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245223,7 +245965,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:845"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket clear netflow x targets
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no row \"x\" in table NetFlow
@@ -245237,7 +245979,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:845: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:845"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245254,7 +245996,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245276,7 +246018,7 @@
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:848"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket clear netflow `cat netflow-uuid` targets
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"clear\" operation cannot be applied to column targets of table NetFlow, which is not allowed to be empty
@@ -245290,7 +246032,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:848: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:848"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245307,7 +246049,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245329,7 +246071,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:851"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket destroy bridge br2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no row \"br2\" in table Bridge
@@ -245343,7 +246085,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:851: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:851"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245360,7 +246102,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245382,7 +246124,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:854"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add in br1 name x
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: cannot modify read-only column name in table Interface
@@ -245396,7 +246138,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:854: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:854"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245413,7 +246155,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245435,7 +246177,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:857"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket set port br0 name=br2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: cannot modify read-only column name in table Port
@@ -245449,7 +246191,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:857: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:857"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245466,7 +246208,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245488,7 +246230,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:860"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket remove bridge br0 name br1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: cannot modify read-only column name in table Bridge
@@ -245502,7 +246244,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:860: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:860"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245519,7 +246261,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245541,7 +246283,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:863"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket remove bridge br1 flood-vlans true
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: \"true\" is not a valid integer
@@ -245555,7 +246297,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:863: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:863"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245572,7 +246314,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245594,7 +246336,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:866"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket clear bridge br1 name
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: cannot modify read-only column name in table Bridge
@@ -245608,7 +246350,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:866: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:866"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245625,7 +246367,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245646,7 +246388,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:869: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:869"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245663,7 +246405,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245679,13 +246421,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1568
-#AT_START_1569
-at_fn_group_banner 1569 'ovs-vsctl.at:872' \
+#AT_STOP_1571
+#AT_START_1572
+at_fn_group_banner 1572 'ovs-vsctl.at:872' \
   "database commands -- conditions" "                " 96
 at_xfail=no
 (
-  $as_echo "1569. $at_setup_line: testing $at_desc ..."
+  $as_echo "1572. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -245699,7 +246441,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:875: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:875"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245720,7 +246462,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245733,7 +246475,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:875: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:875"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -245746,7 +246488,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:876: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- add-br br0 -- add-br br1 -- set bridge br1 flood_vlans=0 other-config:x='\"\"' -- add-br br2 -- set bridge br2 flood_vlans=1 other-config:x=y -- add-br br3 -- set bridge br3 flood_vlans=0,1 other-config:x=z -- add-br br4 -- set bridge br4 flood_vlans=2 -- add-br br5 -- set bridge br5 flood_vlans=0,2 -- add-br br6 -- set bridge br6 flood_vlans=1,2 -- add-br br7 -- set bridge br7 flood_vlans=0,1,2"
 at_fn_check_prepare_trace "ovs-vsctl.at:876"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- add-br br0 -- add-br br1 -- set bridge br1 flood_vlans=0 other-config:x='""' -- add-br br2 -- set bridge br2 flood_vlans=1 other-config:x=y -- add-br br3 -- set bridge br3 flood_vlans=0,1 other-config:x=z -- add-br br4 -- set bridge br4 flood_vlans=2 -- add-br br5 -- set bridge br5 flood_vlans=0,2 -- add-br br6 -- set bridge br6 flood_vlans=1,2 -- add-br br7 -- set bridge br7 flood_vlans=0,1,2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245778,7 +246520,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:906: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans=0' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:906"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans=0' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245793,7 +246535,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:907: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans=1' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:907"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans=1' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245808,7 +246550,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:908: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans=0,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:908"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans=0,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245823,7 +246565,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:909: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans=0,1,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:909"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans=0,1,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245838,7 +246580,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:910: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans=3' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:910"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans=3' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245854,7 +246596,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:912: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans!=0' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:912"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans!=0' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245869,7 +246611,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:913: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans!=1' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:913"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans!=1' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245884,7 +246626,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:914: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans!=0,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:914"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans!=0,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245899,7 +246641,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:915: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans!=0,1,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:915"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans!=0,1,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245914,7 +246656,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:916: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans!=3' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:916"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans!=3' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245930,7 +246672,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:918: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans<2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:918"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans<2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245945,7 +246687,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:919: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans<0,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:919"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans<0,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245960,7 +246702,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:920: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans>1' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:920"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans>1' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245975,7 +246717,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:921: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans>0,1' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:921"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans>0,1' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -245990,7 +246732,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:922: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans<=2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:922"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans<=2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246005,7 +246747,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:923: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans<=0,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:923"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans<=0,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246020,7 +246762,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:924: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans>=1' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:924"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans>=1' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246035,7 +246777,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:925: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans>=0,1' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:925"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans>=0,1' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246052,7 +246794,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:928: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{=}0' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:928"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{=}0' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246067,7 +246809,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:929: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{=}1' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:929"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{=}1' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246082,7 +246824,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:930: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{=}0,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:930"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{=}0,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246097,7 +246839,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:931: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{=}0,1,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:931"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{=}0,1,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246112,7 +246854,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:932: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{=}3' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:932"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{=}3' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246128,7 +246870,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:934: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{!=}0' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:934"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{!=}0' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246143,7 +246885,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:935: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{!=}1' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:935"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{!=}1' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246158,7 +246900,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:936: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{!=}0,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:936"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{!=}0,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246173,7 +246915,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:937: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{!=}0,1,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:937"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{!=}0,1,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246188,7 +246930,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:938: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{!=}3' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:938"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{!=}3' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246204,7 +246946,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:940: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{<}[]' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:940"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{<}[]' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246219,7 +246961,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:941: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{<=}[]' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:941"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{<=}[]' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246234,7 +246976,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:942: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{<}0' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:942"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{<}0' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246249,7 +246991,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:943: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{<=}0' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:943"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{<=}0' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246264,7 +247006,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:944: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{<}1,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:944"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{<}1,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246279,7 +247021,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:945: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{<=}1,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:945"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{<=}1,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246295,7 +247037,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:947: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>}[]' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:947"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>}[]' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246310,7 +247052,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:948: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>=}[]' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:948"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>=}[]' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246325,7 +247067,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:949: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>}0' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:949"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>}0' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246340,7 +247082,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:950: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>=}0' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:950"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>=}0' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246355,7 +247097,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:951: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>}0,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:951"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>}0,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246370,7 +247112,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:952: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>=}1,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:952"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>=}1,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246385,7 +247127,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:953: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>=}0,2' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:953"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'flood_vlans{>=}0,2' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246402,7 +247144,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:956: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x=\"\"' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:956"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x=""' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246417,7 +247159,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:957: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x=y' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:957"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x=y' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246432,7 +247174,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:958: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x=z' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:958"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x=z' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246448,7 +247190,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:960: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x!=\"\"' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:960"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x!=""' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246463,7 +247205,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:961: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x!=y' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:961"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x!=y' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246478,7 +247220,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:962: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x!=z' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:962"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x!=z' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246494,7 +247236,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:964: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x>y' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:964"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x>y' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246509,7 +247251,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:965: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x>=y' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:965"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x>=y' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246524,7 +247266,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:966: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246539,7 +247281,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:967: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x<=y' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:967"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x<=y' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246556,7 +247298,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:970: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{=}[]' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:970"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{=}[]' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246571,7 +247313,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:971: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{=}\"\"' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:971"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{=}""' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246586,7 +247328,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:972: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{=}y' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:972"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{=}y' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246601,7 +247343,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:973: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{=}z' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:973"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{=}z' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246617,7 +247359,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:975: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{!=}[]' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:975"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{!=}[]' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246632,7 +247374,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:976: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{!=}\"\"' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:976"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{!=}""' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246647,7 +247389,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:977: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{!=}y' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:977"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{!=}y' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246662,7 +247404,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:978: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{!=}z' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:978"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{!=}z' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246678,7 +247420,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:980: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<=}[]' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:980"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<=}[]' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246693,7 +247435,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:981: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<=}x' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:981"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<=}x' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246708,7 +247450,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:982: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<=}\"\"' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:982"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<=}""' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246723,7 +247465,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:983: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<=}y' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:983"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<=}y' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246738,7 +247480,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:984: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<=}z' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:984"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<=}z' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246753,7 +247495,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:985: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<=}x,y,z' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:985"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<=}x,y,z' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246769,7 +247511,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:987: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<}[]' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:987"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<}[]' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246784,7 +247526,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:988: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<}x' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:988"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<}x' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246799,7 +247541,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:989: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<}\"\"' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:989"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<}""' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246814,7 +247556,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:990: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<}y' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:990"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<}y' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246829,7 +247571,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:991: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<}z' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:991"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{<}z' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246845,7 +247587,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:993: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>=}[]' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:993"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>=}[]' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246860,7 +247602,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:994: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>=}x' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:994"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>=}x' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246875,7 +247617,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:995: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>=}\"\"' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:995"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>=}""' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246890,7 +247632,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:996: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>=}y' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:996"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>=}y' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246905,7 +247647,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:997: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>=}z' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:997"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>=}z' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246921,7 +247663,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:999: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>}[]' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:999"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>}[]' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246936,7 +247678,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1000: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>}x' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1000"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>}x' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246951,7 +247693,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1001: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>}\"\"' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1001"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>}""' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246966,7 +247708,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1002: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>}y' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1002"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>}y' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246981,7 +247723,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1003: echo \`ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>}z' | sort\`"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1003"
 ( $at_check_trace; echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge 'other-config:x{>}z' | sort`
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -246997,7 +247739,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1004: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1004"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247014,7 +247756,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247030,13 +247772,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1569
-#AT_START_1570
-at_fn_group_banner 1570 'ovs-vsctl.at:1007' \
+#AT_STOP_1572
+#AT_START_1573
+at_fn_group_banner 1573 'ovs-vsctl.at:1007' \
   "database commands -- wait-until immediately true" "" 96
 at_xfail=no
 (
-  $as_echo "1570. $at_setup_line: testing $at_desc ..."
+  $as_echo "1573. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -247045,7 +247787,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1009: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:1009"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247066,7 +247808,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247079,7 +247821,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1009: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1009"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247098,7 +247840,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-bond br0 bond0 eth0 eth1
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket set port bond0 bond_updelay=500 other-config:abc=def
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247110,7 +247852,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1010: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1010"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247127,7 +247869,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247149,7 +247891,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1015"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket wait-until Open_vSwitch . manager_options=[]
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247161,7 +247903,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1015: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1015"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247178,7 +247920,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247200,7 +247942,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1017"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket wait-until Open_vSwitch . bridges!=[]
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247212,7 +247954,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1017: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1017"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247229,7 +247971,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247251,7 +247993,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1019"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket wait-until Port bond0 other-config:abc=def
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247263,7 +248005,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1019: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1019"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247280,7 +248022,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247302,7 +248044,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1021"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket wait-until port bond0 'bond_updelay>50' 'other-config:abc>d' 'other-config:abc>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247314,7 +248056,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1021: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1021"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247331,7 +248073,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247352,7 +248094,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1023: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1023"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247369,7 +248111,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247385,13 +248127,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1570
-#AT_START_1571
-at_fn_group_banner 1571 'ovs-vsctl.at:1026' \
+#AT_STOP_1573
+#AT_START_1574
+at_fn_group_banner 1574 'ovs-vsctl.at:1026' \
   "database commands -- wait-until must wait" "      " 96
 at_xfail=no
 (
-  $as_echo "1571. $at_setup_line: testing $at_desc ..."
+  $as_echo "1574. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -247401,7 +248143,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1029: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:1029"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247422,7 +248164,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247435,7 +248177,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1029: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1029"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247468,7 +248210,7 @@
 
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br br1 -- set bridge br1 other-config:abc=def -- add-bond br1 bond0 eth0 eth1 -- set port bond0 bond_updelay=500
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247480,7 +248222,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1040: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1040"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247497,7 +248239,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247522,7 +248264,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1048: cat stdout1"
 at_fn_check_prepare_trace "ovs-vsctl.at:1048"
 ( $at_check_trace; cat stdout1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247536,7 +248278,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1048: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1048"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247553,7 +248295,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247573,7 +248315,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1050: cat stdout2"
 at_fn_check_prepare_trace "ovs-vsctl.at:1050"
 ( $at_check_trace; cat stdout2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247587,7 +248329,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1050: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1050"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247604,7 +248346,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247624,7 +248366,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1052: cat stdout3"
 at_fn_check_prepare_trace "ovs-vsctl.at:1052"
 ( $at_check_trace; cat stdout3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247638,7 +248380,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1052: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1052"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247655,7 +248397,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247675,7 +248417,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1054: cat stdout4"
 at_fn_check_prepare_trace "ovs-vsctl.at:1054"
 ( $at_check_trace; cat stdout4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247689,7 +248431,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1054: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1054"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247706,7 +248448,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247728,7 +248470,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1057: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1057"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247745,7 +248487,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247761,13 +248503,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1571
-#AT_START_1572
-at_fn_group_banner 1572 'ovs-vsctl.at:1060' \
+#AT_STOP_1574
+#AT_START_1575
+at_fn_group_banner 1575 'ovs-vsctl.at:1060' \
   "--id option on create, get commands" "            " 96
 at_xfail=no
 (
-  $as_echo "1572. $at_setup_line: testing $at_desc ..."
+  $as_echo "1575. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -247776,7 +248518,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1062: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:1062"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247797,7 +248539,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247810,7 +248552,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1062: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1062"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247829,7 +248571,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port br0 eth0
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port br0 eth1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247842,7 +248584,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1066: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- set bridge br0 mirrors=@m -- --id=@eth0 get port eth0 -- --id=@eth1 get port eth1 -- --id=@m create mirror name=mymirror select-dst-port=@eth0 select-src-port=@eth0 output-port=@eth1"
 at_fn_check_prepare_trace "ovs-vsctl.at:1066"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- set bridge br0 mirrors=@m -- --id=@eth0 get port eth0 -- --id=@eth1 get port eth1 -- --id=@m create mirror name=mymirror select-dst-port=@eth0 select-src-port=@eth0 output-port=@eth1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247854,7 +248596,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1066: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1066"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247871,7 +248613,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247891,7 +248633,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1073: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovs-vsctl.at:1073"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247908,7 +248650,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1073: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1073"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247925,7 +248667,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247951,7 +248693,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list mirror
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list bridge br0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -247963,7 +248705,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1081: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1081"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -247980,7 +248722,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248000,7 +248742,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1087: sed -n -e '/uuid/p' -e '/name/p' -e '/mirrors/p' -e '/select/p' -e '/output/p' < stdout | \${PERL} \$srcdir/uuidfilt.pl"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovs-vsctl.at:1087"
 ( $at_check_trace; sed -n -e '/uuid/p' -e '/name/p' -e '/mirrors/p' -e '/select/p' -e '/output/p' < stdout | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -248028,7 +248770,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1087: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1087"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248045,7 +248787,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248066,7 +248808,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1106: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1106"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248083,7 +248825,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248099,13 +248841,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1572
-#AT_START_1573
-at_fn_group_banner 1573 'ovs-vsctl.at:1109' \
+#AT_STOP_1575
+#AT_START_1576
+at_fn_group_banner 1576 'ovs-vsctl.at:1109' \
   "unreferenced record warnings" "                   " 96
 at_xfail=no
 (
-  $as_echo "1573. $at_setup_line: testing $at_desc ..."
+  $as_echo "1576. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -248114,7 +248856,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1111: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:1111"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248135,7 +248877,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248148,7 +248890,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1111: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1111"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248163,7 +248905,7 @@
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovs-vsctl.at:1112"
 ( $at_check_trace; ovs-vsctl -vPATTERN:console:'%c|%p|%m' --no-wait -vreconnect:emer --db=unix:socket \
      -- create Bridge name=br0 | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "vsctl|WARN|applying \"create\" command to table Bridge without --id option will have no effect
@@ -248179,7 +248921,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1112: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1112"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248196,7 +248938,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248218,7 +248960,7 @@
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovs-vsctl.at:1118"
 ( $at_check_trace; ovs-vsctl -vPATTERN:console:'%c|%p|%m' --no-wait -vreconnect:emer --db=unix:socket \
      -- --id=@br0 create Bridge name=br0 | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "vsctl|WARN|row id \"@br0\" was created but no reference to it was inserted, so it will not actually appear in the database
@@ -248234,7 +248976,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1118: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1118"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248251,7 +248993,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248281,7 +249023,7 @@
      -- --id=@m0 create Mirror name=m0 output_port=@eth0 \
      -- --id=@br0 create Bridge name=br0 mirrors=@m0 \
      -- set Open_vSwitch . bridges=@br0 | ${PERL} $srcdir/uuidfilt.pl
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "vsctl|WARN|row id \"@eth0\" was created but only a weak reference to it was inserted, so it will not actually appear in the database
@@ -248300,7 +249042,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1124: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1124"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248317,7 +249059,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248338,7 +249080,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1137: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1137"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248355,7 +249097,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248371,13 +249113,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1573
-#AT_START_1574
-at_fn_group_banner 1574 'ovs-vsctl.at:1143' \
+#AT_STOP_1576
+#AT_START_1577
+at_fn_group_banner 1577 'ovs-vsctl.at:1143' \
   "created row UUID is wrong in same execution" "    " 96
 at_xfail=no
 (
-  $as_echo "1574. $at_setup_line: testing $at_desc ..."
+  $as_echo "1577. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -248386,7 +249128,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1145: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:1145"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248407,7 +249149,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248420,7 +249162,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1145: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1145"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248435,7 +249177,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1146"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --id=@br0 create Bridge name=br0 -- add Open_vSwitch . bridges @br0 -- list bridge
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -248447,7 +249189,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1146: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1146"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248464,7 +249206,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248484,7 +249226,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1148: \${PERL} \$srcdir/uuidfilt.pl stdout"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovs-vsctl.at:1148"
 ( $at_check_trace; ${PERL} $srcdir/uuidfilt.pl stdout
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248526,7 +249268,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1174: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1174"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248543,7 +249285,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248559,13 +249301,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1574
-#AT_START_1575
-at_fn_group_banner 1575 'ovs-vsctl.at:1180' \
+#AT_STOP_1577
+#AT_START_1578
+at_fn_group_banner 1578 'ovs-vsctl.at:1180' \
   "--all option on destroy command" "                " 96
 at_xfail=no
 (
-  $as_echo "1575. $at_setup_line: testing $at_desc ..."
+  $as_echo "1578. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -248574,7 +249316,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1182: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:1182"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248595,7 +249337,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248608,7 +249350,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1182: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1182"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248627,7 +249369,7 @@
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port a a1
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-port a a2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -248639,7 +249381,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1183: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1183"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248656,7 +249398,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248678,7 +249420,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -248692,7 +249434,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1187: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248709,7 +249451,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248732,7 +249474,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-br
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -248746,7 +249488,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1187: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248763,7 +249505,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248786,7 +249528,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -248798,7 +249540,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1187: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248815,7 +249557,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248837,7 +249579,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -248849,7 +249591,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1187: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248866,7 +249608,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248889,7 +249631,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-parent a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -248903,7 +249645,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1187: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248920,7 +249662,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248944,7 +249686,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -248958,7 +249700,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1187: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -248975,7 +249717,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249001,7 +249743,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- br-to-vlan a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249015,7 +249757,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1187: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249032,7 +249774,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249054,7 +249796,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1187: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a"
 at_fn_check_prepare_trace "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- br-to-parent a -- br-to-vlan a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249069,7 +249811,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1187: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1187"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249086,7 +249828,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249108,7 +249850,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1188"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249123,7 +249865,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1188: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1188"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249140,7 +249882,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249163,7 +249905,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1188"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249177,7 +249919,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1188: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1188"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249194,7 +249936,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249216,7 +249958,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1188"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no port named a
@@ -249230,7 +249972,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1188: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1188"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249247,7 +249989,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249269,7 +250011,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1188"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249283,7 +250025,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1188: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1188"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249300,7 +250042,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249321,7 +250063,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1188"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket port-to-br a2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249335,7 +250077,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1188: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1188"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249352,7 +250094,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249374,7 +250116,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1189"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket list-ifaces a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249389,7 +250131,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1189: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1189"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249406,7 +250148,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249428,7 +250170,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1189"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: no interface named a
@@ -249442,7 +250184,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1189: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1189"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249459,7 +250201,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249481,7 +250223,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1189"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249495,7 +250237,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1189: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1189"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249512,7 +250254,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249533,7 +250275,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1189"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket iface-to-br a2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249547,7 +250289,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1189: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1189"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249564,7 +250306,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249584,7 +250326,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1190: ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- set Port a1 qos=@newqos -- set Port a2 qos=@newqos -- --id=@newqos create QoS type=linux-htb other-config:max-rate=1000000000 queues=0=@q0,1=@q1 -- --id=@q0 create Queue other-config:min-rate=100000000 other-config:max-rate=100000000 -- --id=@q1 create Queue other-config:min-rate=500000000"
 at_fn_check_prepare_trace "ovs-vsctl.at:1190"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline  -- set Port a1 qos=@newqos -- set Port a2 qos=@newqos -- --id=@newqos create QoS type=linux-htb other-config:max-rate=1000000000 queues=0=@q0,1=@q1 -- --id=@q0 create Queue other-config:min-rate=100000000 other-config:max-rate=100000000 -- --id=@q1 create Queue other-config:min-rate=500000000
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249596,7 +250338,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1190: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1190"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249613,7 +250355,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249635,7 +250377,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1196"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --columns=other_config,type list Qos
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249650,7 +250392,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1196: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1196"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249667,7 +250409,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249689,7 +250431,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1201"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --columns=other_config list Queue | sort | sed '/^$/d'
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249704,7 +250446,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1201: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1201"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249721,7 +250463,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249745,7 +250487,7 @@
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket clear Port a1 qos
 ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket clear Port a2 qos
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249757,7 +250499,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1206: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1206"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249774,7 +250516,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249796,7 +250538,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1209"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --columns=qos list Port a1 a2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249812,7 +250554,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1209: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1209"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249829,7 +250571,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249851,7 +250593,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1215"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --all destroy Qos
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249863,7 +250605,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1215: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1215"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249880,7 +250622,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249902,7 +250644,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1217"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket -- list Qos
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249914,7 +250656,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1217: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1217"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249931,7 +250673,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249953,7 +250695,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1219"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --all destroy Queue
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -249965,7 +250707,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1219: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1219"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -249982,7 +250724,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -250004,7 +250746,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1221"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket -- list Queue
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250016,7 +250758,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1221: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1221"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -250033,7 +250775,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -250054,7 +250796,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1223: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1223"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -250071,7 +250813,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -250087,13 +250829,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1575
-#AT_START_1576
-at_fn_group_banner 1576 'ovs-vsctl.at:1229' \
+#AT_STOP_1578
+#AT_START_1579
+at_fn_group_banner 1579 'ovs-vsctl.at:1229' \
   "add-port -- reserved names 1" "                   " 97
 at_xfail=no
 (
-  $as_echo "1576. $at_setup_line: testing $at_desc ..."
+  $as_echo "1579. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -250106,7 +250848,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1230: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:1230"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250120,7 +250862,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1230: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-vsctl.at:1230"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -250142,7 +250884,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250157,7 +250899,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1230: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-vsctl.at:1230"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250172,7 +250914,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1230: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-vsctl.at:1230"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -250204,7 +250946,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250221,7 +250963,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1230: ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --  "
 at_fn_check_prepare_trace "ovs-vsctl.at:1230"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250241,7 +250983,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl add-port br0 ovs-netdev"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-netdev
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'ovs-netdev'.  See ovs-vswitchd log for details.
@@ -250263,7 +251005,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -250279,7 +251021,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed -n \"s/^.*\\(|bridge|WARN|.*\\)\$/\\1/p\" ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250297,7 +251039,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed \"/|bridge|WARN|/d\" ovs-vswitchd.log > ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250313,7 +251055,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl del-port br0 ovs-netdev"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl del-port br0 ovs-netdev
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250329,7 +251071,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl add-port br0 ovs-dummy"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'ovs-dummy'.  See ovs-vswitchd log for details.
@@ -250351,7 +251093,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -250367,7 +251109,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed -n \"s/^.*\\(|bridge|WARN|.*\\)\$/\\1/p\" ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250385,7 +251127,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed \"/|bridge|WARN|/d\" ovs-vswitchd.log > ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250401,7 +251143,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl del-port br0 ovs-dummy"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl del-port br0 ovs-dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250417,7 +251159,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl add-port br0 genev_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl add-port br0 genev_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'genev_sys'.  See ovs-vswitchd log for details.
@@ -250439,7 +251181,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -250455,7 +251197,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed -n \"s/^.*\\(|bridge|WARN|.*\\)\$/\\1/p\" ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250473,7 +251215,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed \"/|bridge|WARN|/d\" ovs-vswitchd.log > ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250489,7 +251231,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl del-port br0 genev_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl del-port br0 genev_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250505,7 +251247,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl add-port br0 gre_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl add-port br0 gre_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'gre_sys'.  See ovs-vswitchd log for details.
@@ -250527,7 +251269,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -250543,7 +251285,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed -n \"s/^.*\\(|bridge|WARN|.*\\)\$/\\1/p\" ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250561,7 +251303,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed \"/|bridge|WARN|/d\" ovs-vswitchd.log > ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250577,7 +251319,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl del-port br0 gre_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl del-port br0 gre_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250593,7 +251335,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl add-port br0 gre64_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl add-port br0 gre64_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'gre64_sys'.  See ovs-vswitchd log for details.
@@ -250615,7 +251357,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -250631,7 +251373,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed -n \"s/^.*\\(|bridge|WARN|.*\\)\$/\\1/p\" ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250649,7 +251391,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed \"/|bridge|WARN|/d\" ovs-vswitchd.log > ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250665,7 +251407,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl del-port br0 gre64_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl del-port br0 gre64_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250681,7 +251423,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl add-port br0 lisp_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl add-port br0 lisp_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'lisp_sys'.  See ovs-vswitchd log for details.
@@ -250703,7 +251445,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -250719,7 +251461,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed -n \"s/^.*\\(|bridge|WARN|.*\\)\$/\\1/p\" ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250737,7 +251479,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed \"/|bridge|WARN|/d\" ovs-vswitchd.log > ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250753,7 +251495,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl del-port br0 lisp_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl del-port br0 lisp_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250769,7 +251511,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl add-port br0 vxlan_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl add-port br0 vxlan_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'vxlan_sys'.  See ovs-vswitchd log for details.
@@ -250791,7 +251533,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -250807,7 +251549,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed -n \"s/^.*\\(|bridge|WARN|.*\\)\$/\\1/p\" ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250825,7 +251567,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: sed \"/|bridge|WARN|/d\" ovs-vswitchd.log > ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1233"
 ( $at_check_trace; sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250841,7 +251583,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1233: ovs-vsctl del-port br0 vxlan_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1233"
 ( $at_check_trace; ovs-vsctl del-port br0 vxlan_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250856,7 +251598,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1257: check_logs "
 at_fn_check_prepare_trace "ovs-vsctl.at:1257"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250871,7 +251613,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1257: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-vsctl.at:1257"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250886,7 +251628,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1257: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-vsctl.at:1257"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250901,13 +251643,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1576
-#AT_START_1577
-at_fn_group_banner 1577 'ovs-vsctl.at:1260' \
+#AT_STOP_1579
+#AT_START_1580
+at_fn_group_banner 1580 'ovs-vsctl.at:1260' \
   "add-port -- reserved names 2" "                   " 97
 at_xfail=no
 (
-  $as_echo "1577. $at_setup_line: testing $at_desc ..."
+  $as_echo "1580. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # Creates all type of tunnel ports
@@ -250921,7 +251663,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1262: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:1262"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250935,7 +251677,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1262: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-vsctl.at:1262"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -250957,7 +251699,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250972,7 +251714,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1262: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "ovs-vsctl.at:1262"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -250987,7 +251729,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1262: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "ovs-vsctl.at:1262"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -251019,7 +251761,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251056,7 +251798,7 @@
                     options:remote_ip=2.2.2.2 ofport_request=4 \
                     -- add-port br0 p5 -- set Interface p5 type=geneve \
                     options:remote_ip=2.2.2.2 ofport_request=5
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251076,7 +251818,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: ovs-vsctl add-port br0 genev_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1275"
 ( $at_check_trace; ovs-vsctl add-port br0 genev_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'genev_sys'.  See ovs-vswitchd log for details.
@@ -251098,7 +251840,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251114,7 +251856,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: sed -n \"s/^.*\\(|bridge|WARN|.*\\)\$/\\1/p\" ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1275"
 ( $at_check_trace; sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251132,7 +251874,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: sed \"/|bridge|WARN|/d\" ovs-vswitchd.log > ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1275"
 ( $at_check_trace; sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251148,7 +251890,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: ovs-vsctl del-port br0 genev_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1275"
 ( $at_check_trace; ovs-vsctl del-port br0 genev_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251164,7 +251906,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: ovs-vsctl add-port br0 gre_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1275"
 ( $at_check_trace; ovs-vsctl add-port br0 gre_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'gre_sys'.  See ovs-vswitchd log for details.
@@ -251186,7 +251928,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251202,7 +251944,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: sed -n \"s/^.*\\(|bridge|WARN|.*\\)\$/\\1/p\" ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1275"
 ( $at_check_trace; sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251220,7 +251962,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: sed \"/|bridge|WARN|/d\" ovs-vswitchd.log > ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1275"
 ( $at_check_trace; sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251236,7 +251978,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: ovs-vsctl del-port br0 gre_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1275"
 ( $at_check_trace; ovs-vsctl del-port br0 gre_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251252,7 +251994,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: ovs-vsctl add-port br0 gre64_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1275"
 ( $at_check_trace; ovs-vsctl add-port br0 gre64_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'gre64_sys'.  See ovs-vswitchd log for details.
@@ -251274,7 +252016,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251290,7 +252032,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: sed -n \"s/^.*\\(|bridge|WARN|.*\\)\$/\\1/p\" ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1275"
 ( $at_check_trace; sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251308,7 +252050,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: sed \"/|bridge|WARN|/d\" ovs-vswitchd.log > ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1275"
 ( $at_check_trace; sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251324,7 +252066,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: ovs-vsctl del-port br0 gre64_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1275"
 ( $at_check_trace; ovs-vsctl del-port br0 gre64_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251340,7 +252082,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: ovs-vsctl add-port br0 lisp_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1275"
 ( $at_check_trace; ovs-vsctl add-port br0 lisp_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'lisp_sys'.  See ovs-vswitchd log for details.
@@ -251362,7 +252104,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251378,7 +252120,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: sed -n \"s/^.*\\(|bridge|WARN|.*\\)\$/\\1/p\" ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1275"
 ( $at_check_trace; sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251396,7 +252138,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: sed \"/|bridge|WARN|/d\" ovs-vswitchd.log > ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1275"
 ( $at_check_trace; sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251412,7 +252154,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: ovs-vsctl del-port br0 lisp_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1275"
 ( $at_check_trace; ovs-vsctl del-port br0 lisp_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251428,7 +252170,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: ovs-vsctl add-port br0 vxlan_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1275"
 ( $at_check_trace; ovs-vsctl add-port br0 vxlan_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "ovs-vsctl: Error detected while setting up 'vxlan_sys'.  See ovs-vswitchd log for details.
@@ -251450,7 +252192,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251466,7 +252208,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: sed -n \"s/^.*\\(|bridge|WARN|.*\\)\$/\\1/p\" ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1275"
 ( $at_check_trace; sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251484,7 +252226,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: sed \"/|bridge|WARN|/d\" ovs-vswitchd.log > ovs-vswitchd.log"
 at_fn_check_prepare_notrace 'a shell pipeline' "ovs-vsctl.at:1275"
 ( $at_check_trace; sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251500,7 +252242,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1275: ovs-vsctl del-port br0 vxlan_sys"
 at_fn_check_prepare_trace "ovs-vsctl.at:1275"
 ( $at_check_trace; ovs-vsctl del-port br0 vxlan_sys
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251515,7 +252257,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1297: check_logs "
 at_fn_check_prepare_trace "ovs-vsctl.at:1297"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251530,7 +252272,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1297: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "ovs-vsctl.at:1297"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251545,7 +252287,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1297: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "ovs-vsctl.at:1297"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251560,13 +252302,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1577
-#AT_START_1578
-at_fn_group_banner 1578 'ovs-vsctl.at:1300' \
+#AT_STOP_1580
+#AT_START_1581
+at_fn_group_banner 1581 'ovs-vsctl.at:1300' \
   "naming in db commands" "                          " 97
 at_xfail=no
 (
-  $as_echo "1578. $at_setup_line: testing $at_desc ..."
+  $as_echo "1581. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -251574,7 +252316,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1301: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-vsctl.at:1301"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251595,7 +252337,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251608,7 +252350,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1301: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1301"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251624,7 +252366,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1304"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br br0
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251641,7 +252383,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1306"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket get port $uuid name
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251659,7 +252401,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1311"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket add-br 0fcd11a1-2ba8-4b38-a358-4bccf2bf3057
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251674,7 +252416,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "ovs-vsctl.at:1312"
 ( $at_check_trace; ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket get interface 0fcd11a1-2ba8-4b38-a358-4bccf2bf3057 type
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251691,7 +252433,7 @@
 $as_echo "$at_srcdir/ovs-vsctl.at:1315: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-vsctl.at:1315"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251708,7 +252450,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251724,13 +252466,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1578
-#AT_START_1579
-at_fn_group_banner 1579 'ovs-monitor-ipsec.at:3' \
+#AT_STOP_1581
+#AT_START_1582
+at_fn_group_banner 1582 'ovs-monitor-ipsec.at:3' \
   "ovs-monitor-ipsec" "                              " 98
 at_xfail=no
 (
-  $as_echo "1579. $at_setup_line: testing $at_desc ..."
+  $as_echo "1582. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "ovs-monitor-ipsec.at:4" >"$at_check_line_file"
@@ -251790,7 +252532,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:46: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-monitor-ipsec.at:46"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251811,7 +252553,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251824,7 +252566,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:46: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-monitor-ipsec.at:46"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251845,7 +252587,7 @@
 ( $at_check_trace; $PYTHON $top_srcdir/debian/ovs-monitor-ipsec "--root-prefix=`pwd`" \
         "--pidfile=`pwd`/ovs-monitor-ipsec.pid" \
         unix:socket 2>log 3>actions &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251864,7 +252606,7 @@
 ( $at_check_trace; ovs_wait_cond () { test ! -f etc/racoon/certs/ovs-stale.pem
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251893,7 +252635,7 @@
               -- set interface gre0 type=ipsec_gre \
                                     options:remote_ip=1.2.3.4 \
                                     options:psk=swordfish
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251912,7 +252654,7 @@
 ( $at_check_trace; ovs_wait_cond () { test -f actions && grep 'spdadd 1.2.3.4' actions >/dev/null
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -251927,7 +252669,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:69: cat actions"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:69"
 ( $at_check_trace; cat actions
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251952,7 +252694,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:80: trim etc/racoon/psk.txt"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:80"
 ( $at_check_trace; trim etc/racoon/psk.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -251969,7 +252711,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:82: trim etc/racoon/racoon.conf"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:82"
 ( $at_check_trace; trim etc/racoon/racoon.conf
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252008,7 +252750,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:107: ovs_vsctl del-port gre0"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:107"
 ( $at_check_trace; ovs_vsctl del-port gre0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252027,7 +252769,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < actions` -ge 17
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252042,7 +252784,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:109: sed '1,9d' actions"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:109"
 ( $at_check_trace; sed '1,9d' actions
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252066,7 +252808,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:119: trim etc/racoon/psk.txt"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:119"
 ( $at_check_trace; trim etc/racoon/psk.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252081,7 +252823,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:120: trim etc/racoon/racoon.conf"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:120"
 ( $at_check_trace; trim etc/racoon/racoon.conf
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252140,7 +252882,7 @@
 "' \
                  options:certificate='"/cert.pem"' \
                  options:private_key='"/key.pem"'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252159,7 +252901,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < actions` -ge 21
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252174,7 +252916,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:156: sed '1,17d' actions"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:156"
 ( $at_check_trace; sed '1,17d' actions
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252194,7 +252936,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:162: trim etc/racoon/psk.txt"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:162"
 ( $at_check_trace; trim etc/racoon/psk.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252209,7 +252951,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:163: trim etc/racoon/racoon.conf"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:163"
 ( $at_check_trace; trim etc/racoon/racoon.conf
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252250,7 +252992,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:190: cat etc/racoon/certs/ovs-2.3.4.5.pem"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:190"
 ( $at_check_trace; cat etc/racoon/certs/ovs-2.3.4.5.pem
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252273,7 +253015,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:199: ovs_vsctl del-port gre1"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:199"
 ( $at_check_trace; ovs_vsctl del-port gre1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252292,7 +253034,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < actions` -ge 29
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252307,7 +253049,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:201: sed '1,21d' actions"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:201"
 ( $at_check_trace; sed '1,21d' actions
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252331,7 +253073,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:211: trim etc/racoon/psk.txt"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:211"
 ( $at_check_trace; trim etc/racoon/psk.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252346,7 +253088,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:212: trim etc/racoon/racoon.conf"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:212"
 ( $at_check_trace; trim etc/racoon/racoon.conf
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252371,7 +253113,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:223: test ! -f etc/racoon/certs/ovs-2.3.4.5.pem"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:223"
 ( $at_check_trace; test ! -f etc/racoon/certs/ovs-2.3.4.5.pem
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252414,7 +253156,7 @@
 -----END CERTIFICATE-----
 "' \
                  options:use_ssl_cert='"true"'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252433,7 +253175,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < actions` -ge 33
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252448,7 +253190,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:245: sed '1,29d' actions"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:245"
 ( $at_check_trace; sed '1,29d' actions
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252468,7 +253210,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:251: trim etc/racoon/psk.txt"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:251"
 ( $at_check_trace; trim etc/racoon/psk.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252483,7 +253225,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:252: trim etc/racoon/racoon.conf"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:252"
 ( $at_check_trace; trim etc/racoon/racoon.conf
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252524,7 +253266,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:279: cat etc/racoon/certs/ovs-3.4.5.6.pem"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:279"
 ( $at_check_trace; cat etc/racoon/certs/ovs-3.4.5.6.pem
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252547,7 +253289,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:288: ovs_vsctl del-port gre2"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:288"
 ( $at_check_trace; ovs_vsctl del-port gre2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252566,7 +253308,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `wc -l < actions` -ge 41
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252581,7 +253323,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:290: sed '1,33d' actions"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:290"
 ( $at_check_trace; sed '1,33d' actions
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252605,7 +253347,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:300: trim etc/racoon/psk.txt"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:300"
 ( $at_check_trace; trim etc/racoon/psk.txt
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252620,7 +253362,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:301: trim etc/racoon/racoon.conf"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:301"
 ( $at_check_trace; trim etc/racoon/racoon.conf
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252645,7 +253387,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:312: test ! -f etc/racoon/certs/ovs-3.4.5.6.pem"
 at_fn_check_prepare_trace "ovs-monitor-ipsec.at:312"
 ( $at_check_trace; test ! -f etc/racoon/certs/ovs-3.4.5.6.pem
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252662,7 +253404,7 @@
 $as_echo "$at_srcdir/ovs-monitor-ipsec.at:314: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-monitor-ipsec.at:314"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252681,7 +253423,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252700,13 +253442,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1579
-#AT_START_1580
-at_fn_group_banner 1580 'ovs-xapi-sync.at:3' \
+#AT_STOP_1582
+#AT_START_1583
+at_fn_group_banner 1583 'ovs-xapi-sync.at:3' \
   "ovs-xapi-sync" "                                  " 99
 at_xfail=no
 (
-  $as_echo "1580. $at_setup_line: testing $at_desc ..."
+  $as_echo "1583. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "ovs-xapi-sync.at:4" >"$at_check_line_file"
@@ -252745,7 +253487,7 @@
 $as_echo "$at_srcdir/ovs-xapi-sync.at:29: ovsdb-tool create db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-xapi-sync.at:29"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252766,7 +253508,7 @@
           {"op": "insert",
            "table": "Open_vSwitch",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252779,7 +253521,7 @@
 $as_echo "$at_srcdir/ovs-xapi-sync.at:29: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-xapi-sync.at:29"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252796,7 +253538,7 @@
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-xapi-sync.at:32"
 ( $at_check_trace; $PYTHON ./ovs-xapi-sync "--pidfile=`pwd`/ovs-xapi-sync.pid" \
                   "--root-prefix=`pwd`" unix:socket >log 2>&1 &
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252812,7 +253554,7 @@
 $as_echo "$at_srcdir/ovs-xapi-sync.at:37: ovs_vsctl -- add-br xenbr0 -- add-br xenbr1"
 at_fn_check_prepare_trace "ovs-xapi-sync.at:37"
 ( $at_check_trace; ovs_vsctl -- add-br xenbr0 -- add-br xenbr1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252830,7 +253572,7 @@
 ( $at_check_trace; ovs_wait_cond () { test "X`ovs_vsctl get bridge xenbr0 fail-mode`" != "X[]"
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252848,7 +253590,7 @@
 ( $at_check_trace; ovs_vsctl \
                 -- get bridge xenbr0 fail-mode other-config external-ids \
                 -- get bridge xenbr1 fail-mode other-config external-ids
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252875,7 +253617,7 @@
 ( $at_check_trace; ovs_vsctl \
                 -- add-port xenbr0 vif1.0 \
                 -- set Interface vif1.0 'external-ids={attached-mac="00:11:22:33:44:55", xs-network-uuid="9b66c68b-a74e-4d34-89a5-20a8ab352d1e", xs-vif-uuid="6ab1b260-398e-49ba-827b-c7696108964c", xs-vm-uuid="fcb8a3f6-dc04-41d2-8b8a-55afd2b755b8"'}
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252893,7 +253635,7 @@
 ( $at_check_trace; ovs_wait_cond () { ovs_vsctl get interface vif1.0 external-ids:iface-id >/dev/null 2>&1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252907,7 +253649,7 @@
 $as_echo "$at_srcdir/ovs-xapi-sync.at:55: ovs_vsctl get interface vif1.0 external-ids"
 at_fn_check_prepare_trace "ovs-xapi-sync.at:55"
 ( $at_check_trace; ovs_vsctl get interface vif1.0 external-ids
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252925,7 +253667,7 @@
 $as_echo "$at_srcdir/ovs-xapi-sync.at:60: ovs_vsctl add-port xenbr0 tap1.0"
 at_fn_check_prepare_trace "ovs-xapi-sync.at:60"
 ( $at_check_trace; ovs_vsctl add-port xenbr0 tap1.0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252943,7 +253685,7 @@
 ( $at_check_trace; ovs_wait_cond () { ovs_vsctl get interface tap1.0 external-ids:iface-id >/dev/null 2>&1
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -252961,7 +253703,7 @@
 ( $at_check_trace; ovs_vsctl \
                 -- get interface vif1.0 external-ids \
                 -- get interface tap1.0 external-ids
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252980,7 +253722,7 @@
 $as_echo "$at_srcdir/ovs-xapi-sync.at:70: ovs_vsctl del-port tap1.0"
 at_fn_check_prepare_trace "ovs-xapi-sync.at:70"
 ( $at_check_trace; ovs_vsctl del-port tap1.0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -252998,7 +253740,7 @@
 ( $at_check_trace; ovs_wait_cond () { test `ovs_vsctl get interface vif1.0 external-ids:iface-status` = active
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -253012,7 +253754,7 @@
 $as_echo "$at_srcdir/ovs-xapi-sync.at:72: ovs_vsctl get interface vif1.0 external-ids"
 at_fn_check_prepare_trace "ovs-xapi-sync.at:72"
 ( $at_check_trace; ovs_vsctl get interface vif1.0 external-ids
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253030,7 +253772,7 @@
 $as_echo "$at_srcdir/ovs-xapi-sync.at:76: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "ovs-xapi-sync.at:76"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -253048,7 +253790,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -253066,13 +253808,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1580
-#AT_START_1581
-at_fn_group_banner 1581 'interface-reconfigure.at:697' \
+#AT_STOP_1583
+#AT_START_1584
+at_fn_group_banner 1584 'interface-reconfigure.at:697' \
   "non-VLAN, non-bond" "                             " 100
 at_xfail=no
 (
-  $as_echo "1581. $at_setup_line: testing $at_desc ..."
+  $as_echo "1584. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -253088,7 +253830,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:703: ifr_run --force xenbr2 up"
 at_fn_check_prepare_trace "interface-reconfigure.at:703"
 ( $at_check_trace; ifr_run --force xenbr2 up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -253101,7 +253843,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:704: ifr_filter"
 at_fn_check_prepare_trace "interface-reconfigure.at:704"
 ( $at_check_trace; ifr_filter
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253151,7 +253893,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:741: cat etc/sysconfig/network-scripts/ifcfg-xenbr2"
 at_fn_check_prepare_trace "interface-reconfigure.at:741"
 ( $at_check_trace; cat etc/sysconfig/network-scripts/ifcfg-xenbr2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253177,7 +253919,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:755: configure_netdev xenbr2 00:15:17:a0:29:80 0"
 at_fn_check_prepare_trace "interface-reconfigure.at:755"
 ( $at_check_trace; configure_netdev xenbr2 00:15:17:a0:29:80 0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253191,7 +253933,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:757: ifr_run --force xenbr2 down"
 at_fn_check_prepare_trace "interface-reconfigure.at:757"
 ( $at_check_trace; ifr_run --force xenbr2 down
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -253204,7 +253946,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:758: ifr_filter"
 at_fn_check_prepare_trace "interface-reconfigure.at:758"
 ( $at_check_trace; ifr_filter
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253231,13 +253973,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1581
-#AT_START_1582
-at_fn_group_banner 1582 'interface-reconfigure.at:774' \
+#AT_STOP_1584
+#AT_START_1585
+at_fn_group_banner 1585 'interface-reconfigure.at:774' \
   "VLAN, non-bond" "                                 " 100
 at_xfail=no
 (
-  $as_echo "1582. $at_setup_line: testing $at_desc ..."
+  $as_echo "1585. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -253253,7 +253995,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:780: ifr_run --force xapi3 up"
 at_fn_check_prepare_trace "interface-reconfigure.at:780"
 ( $at_check_trace; ifr_run --force xapi3 up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -253266,7 +254008,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:781: ifr_filter"
 at_fn_check_prepare_trace "interface-reconfigure.at:781"
 ( $at_check_trace; ifr_filter
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253312,7 +254054,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:814: cat etc/sysconfig/network-scripts/ifcfg-xapi3"
 at_fn_check_prepare_trace "interface-reconfigure.at:814"
 ( $at_check_trace; cat etc/sysconfig/network-scripts/ifcfg-xapi3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253337,7 +254079,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:827: configure_netdev xapi3 00:23:20:AC:AF:02 0"
 at_fn_check_prepare_trace "interface-reconfigure.at:827"
 ( $at_check_trace; configure_netdev xapi3 00:23:20:AC:AF:02 0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253351,7 +254093,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:829: ifr_run --force xapi3 down"
 at_fn_check_prepare_trace "interface-reconfigure.at:829"
 ( $at_check_trace; ifr_run --force xapi3 down
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -253364,7 +254106,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:830: ifr_filter"
 at_fn_check_prepare_trace "interface-reconfigure.at:830"
 ( $at_check_trace; ifr_filter
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253394,13 +254136,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1582
-#AT_START_1583
-at_fn_group_banner 1583 'interface-reconfigure.at:849' \
+#AT_STOP_1585
+#AT_START_1586
+at_fn_group_banner 1586 'interface-reconfigure.at:849' \
   "Bond, non-VLAN" "                                 " 100
 at_xfail=no
 (
-  $as_echo "1583. $at_setup_line: testing $at_desc ..."
+  $as_echo "1586. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -253421,7 +254163,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:860: configure_netdev bond0 00:23:20:e6:39:75 0"
 at_fn_check_prepare_trace "interface-reconfigure.at:860"
 ( $at_check_trace; configure_netdev bond0 00:23:20:e6:39:75 0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253435,7 +254177,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:862: ifr_run --force xapi1 up"
 at_fn_check_prepare_trace "interface-reconfigure.at:862"
 ( $at_check_trace; ifr_run --force xapi1 up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -253448,7 +254190,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:863: ifr_filter"
 at_fn_check_prepare_trace "interface-reconfigure.at:863"
 ( $at_check_trace; ifr_filter
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253504,7 +254246,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:906: cat etc/sysconfig/network-scripts/ifcfg-xapi1"
 at_fn_check_prepare_trace "interface-reconfigure.at:906"
 ( $at_check_trace; cat etc/sysconfig/network-scripts/ifcfg-xapi1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253529,7 +254271,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:919: configure_netdev xapi1 00:22:19:22:4B:AF 0"
 at_fn_check_prepare_trace "interface-reconfigure.at:919"
 ( $at_check_trace; configure_netdev xapi1 00:22:19:22:4B:AF 0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253543,7 +254285,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:921: ifr_run --force xapi1 down"
 at_fn_check_prepare_trace "interface-reconfigure.at:921"
 ( $at_check_trace; ifr_run --force xapi1 down
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -253556,7 +254298,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:922: ifr_filter"
 at_fn_check_prepare_trace "interface-reconfigure.at:922"
 ( $at_check_trace; ifr_filter
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253584,13 +254326,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1583
-#AT_START_1584
-at_fn_group_banner 1584 'interface-reconfigure.at:939' \
+#AT_STOP_1586
+#AT_START_1587
+at_fn_group_banner 1587 'interface-reconfigure.at:939' \
   "VLAN on bond" "                                   " 100
 at_xfail=no
 (
-  $as_echo "1584. $at_setup_line: testing $at_desc ..."
+  $as_echo "1587. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -253611,7 +254353,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:950: configure_netdev bond0 00:23:20:e6:39:75 0"
 at_fn_check_prepare_trace "interface-reconfigure.at:950"
 ( $at_check_trace; configure_netdev bond0 00:23:20:e6:39:75 0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253625,7 +254367,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:952: ifr_run --force xapi2 up"
 at_fn_check_prepare_trace "interface-reconfigure.at:952"
 ( $at_check_trace; ifr_run --force xapi2 up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -253638,7 +254380,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:953: ifr_filter"
 at_fn_check_prepare_trace "interface-reconfigure.at:953"
 ( $at_check_trace; ifr_filter
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253698,7 +254440,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:1000: cat etc/sysconfig/network-scripts/ifcfg-xapi2"
 at_fn_check_prepare_trace "interface-reconfigure.at:1000"
 ( $at_check_trace; cat etc/sysconfig/network-scripts/ifcfg-xapi2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253723,7 +254465,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:1013: configure_netdev xapi2 00:23:20:A4:71:C2 0"
 at_fn_check_prepare_trace "interface-reconfigure.at:1013"
 ( $at_check_trace; configure_netdev xapi2 00:23:20:A4:71:C2 0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253737,7 +254479,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:1015: ifr_run --force xapi2 down"
 at_fn_check_prepare_trace "interface-reconfigure.at:1015"
 ( $at_check_trace; ifr_run --force xapi2 down
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -253750,7 +254492,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:1016: ifr_filter"
 at_fn_check_prepare_trace "interface-reconfigure.at:1016"
 ( $at_check_trace; ifr_filter
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253781,13 +254523,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1584
-#AT_START_1585
-at_fn_group_banner 1585 'interface-reconfigure.at:1040' \
+#AT_STOP_1587
+#AT_START_1588
+at_fn_group_banner 1588 'interface-reconfigure.at:1040' \
   "Re-create port with different types" "            " 100
 at_xfail=no
 (
-  $as_echo "1585. $at_setup_line: testing $at_desc ..."
+  $as_echo "1588. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -253801,7 +254543,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:1042: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "interface-reconfigure.at:1042"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253815,7 +254557,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:1042: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "interface-reconfigure.at:1042"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -253837,7 +254579,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253852,7 +254594,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:1042: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "interface-reconfigure.at:1042"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253867,7 +254609,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:1042: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "interface-reconfigure.at:1042"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -253899,7 +254641,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253920,7 +254662,7 @@
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15] fail-mode=secure -- add-port br0 p0 -- set int p0 type=gre options:remote_ip=127.0.0.1 -- \
    add-port br0 p1 -- set int p1 type=dummy -- \
    add-port br0 p2 -- set int p2 type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253937,7 +254679,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:1047: ovs-vsctl set int p1 type=gre options:remote_ip=127.0.0.1"
 at_fn_check_prepare_trace "interface-reconfigure.at:1047"
 ( $at_check_trace; ovs-vsctl set int p1 type=gre options:remote_ip=127.0.0.1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253952,7 +254694,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:1048: ovs-vsctl del-port p1"
 at_fn_check_prepare_trace "interface-reconfigure.at:1048"
 ( $at_check_trace; ovs-vsctl del-port p1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253967,7 +254709,7 @@
 $as_echo "$at_srcdir/interface-reconfigure.at:1049: ovs-vsctl add-port br0 p1 -- set int p1 type=dummy"
 at_fn_check_prepare_trace "interface-reconfigure.at:1049"
 ( $at_check_trace; ovs-vsctl add-port br0 p1 -- set int p1 type=dummy
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -253983,13 +254725,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1585
-#AT_START_1586
-at_fn_group_banner 1586 'stp.at:3' \
+#AT_STOP_1588
+#AT_START_1589
+at_fn_group_banner 1589 'stp.at:3' \
   "STP example from IEEE 802.1D-1998" "              " 101
 at_xfail=no
 (
-  $as_echo "1586. $at_setup_line: testing $at_desc ..."
+  $as_echo "1589. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254011,7 +254753,7 @@
 $as_echo "$at_srcdir/stp.at:18: ovstest test-stp test-stp-ieee802.1d-1998"
 at_fn_check_prepare_trace "stp.at:18"
 ( $at_check_trace; ovstest test-stp test-stp-ieee802.1d-1998
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "stp|INFO|stp42: detected topology change.
@@ -254030,13 +254772,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1586
-#AT_START_1587
-at_fn_group_banner 1587 'stp.at:27' \
+#AT_STOP_1589
+#AT_START_1590
+at_fn_group_banner 1590 'stp.at:27' \
   "STP example from IEEE 802.1D-2004 figures 17.4 and 17.5" "" 101
 at_xfail=no
 (
-  $as_echo "1587. $at_setup_line: testing $at_desc ..."
+  $as_echo "1590. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254077,7 +254819,7 @@
 $as_echo "$at_srcdir/stp.at:61: ovstest test-stp test-stp-ieee802.1d-2004-fig17.4"
 at_fn_check_prepare_trace "stp.at:61"
 ( $at_check_trace; ovstest test-stp test-stp-ieee802.1d-2004-fig17.4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "stp|INFO|stp111: detected topology change.
@@ -254096,13 +254838,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1587
-#AT_START_1588
-at_fn_group_banner 1588 'stp.at:70' \
+#AT_STOP_1590
+#AT_START_1591
+at_fn_group_banner 1591 'stp.at:70' \
   "STP example from IEEE 802.1D-2004 figure 17.6" "  " 101
 at_xfail=no
 (
-  $as_echo "1588. $at_setup_line: testing $at_desc ..."
+  $as_echo "1591. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254126,7 +254868,7 @@
 $as_echo "$at_srcdir/stp.at:87: ovstest test-stp test-stp-ieee802.1d-2004-fig17.6"
 at_fn_check_prepare_trace "stp.at:87"
 ( $at_check_trace; ovstest test-stp test-stp-ieee802.1d-2004-fig17.6
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "stp|INFO|stp111: detected topology change.
@@ -254145,13 +254887,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1588
-#AT_START_1589
-at_fn_group_banner 1589 'stp.at:96' \
+#AT_STOP_1591
+#AT_START_1592
+at_fn_group_banner 1592 'stp.at:96' \
   "STP example from IEEE 802.1D-2004 figure 17.7" "  " 101
 at_xfail=no
 (
-  $as_echo "1589. $at_setup_line: testing $at_desc ..."
+  $as_echo "1592. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254178,7 +254920,7 @@
 $as_echo "$at_srcdir/stp.at:116: ovstest test-stp test-stp-ieee802.1d-2004-fig17.7"
 at_fn_check_prepare_trace "stp.at:116"
 ( $at_check_trace; ovstest test-stp test-stp-ieee802.1d-2004-fig17.7
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "stp|INFO|stpaa: detected topology change.
@@ -254197,13 +254939,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1589
-#AT_START_1590
-at_fn_group_banner 1590 'stp.at:125' \
+#AT_STOP_1592
+#AT_START_1593
+at_fn_group_banner 1593 'stp.at:125' \
   "STP.io.1.1: Link Failure" "                       " 101
 at_xfail=no
 (
-  $as_echo "1590. $at_setup_line: testing $at_desc ..."
+  $as_echo "1593. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254240,7 +254982,7 @@
 $as_echo "$at_srcdir/stp.at:155: ovstest test-stp test-stp-iol-io-1.1"
 at_fn_check_prepare_trace "stp.at:155"
 ( $at_check_trace; ovstest test-stp test-stp-iol-io-1.1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "stp|INFO|stp111: detected topology change.
@@ -254259,13 +255001,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1590
-#AT_START_1591
-at_fn_group_banner 1591 'stp.at:164' \
+#AT_STOP_1593
+#AT_START_1594
+at_fn_group_banner 1594 'stp.at:164' \
   "STP.io.1.2: Repeated Network" "                   " 101
 at_xfail=no
 (
-  $as_echo "1591. $at_setup_line: testing $at_desc ..."
+  $as_echo "1594. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254289,7 +255031,7 @@
 $as_echo "$at_srcdir/stp.at:181: ovstest test-stp test-stp-iol-io-1.2"
 at_fn_check_prepare_trace "stp.at:181"
 ( $at_check_trace; ovstest test-stp test-stp-iol-io-1.2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "stp|INFO|stp111: detected topology change.
@@ -254306,13 +255048,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1591
-#AT_START_1592
-at_fn_group_banner 1592 'stp.at:188' \
+#AT_STOP_1594
+#AT_START_1595
+at_fn_group_banner 1595 'stp.at:188' \
   "STP.io.1.4: Network Initialization" "             " 101
 at_xfail=no
 (
-  $as_echo "1592. $at_setup_line: testing $at_desc ..."
+  $as_echo "1595. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254336,7 +255078,7 @@
 $as_echo "$at_srcdir/stp.at:205: ovstest test-stp test-stp-iol-io-1.4"
 at_fn_check_prepare_trace "stp.at:205"
 ( $at_check_trace; ovstest test-stp test-stp-iol-io-1.4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "stp|INFO|stp111: detected topology change.
@@ -254355,13 +255097,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1592
-#AT_START_1593
-at_fn_group_banner 1593 'stp.at:214' \
+#AT_STOP_1595
+#AT_START_1596
+at_fn_group_banner 1596 'stp.at:214' \
   "STP.io.1.5: Topology Change" "                    " 101
 at_xfail=no
 (
-  $as_echo "1593. $at_setup_line: testing $at_desc ..."
+  $as_echo "1596. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254412,7 +255154,7 @@
 $as_echo "$at_srcdir/stp.at:258: ovstest test-stp test-stp-iol-io-1.5"
 at_fn_check_prepare_trace "stp.at:258"
 ( $at_check_trace; ovstest test-stp test-stp-iol-io-1.5
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "stp|INFO|stp111: detected topology change.
@@ -254431,13 +255173,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1593
-#AT_START_1594
-at_fn_group_banner 1594 'stp.at:267' \
+#AT_STOP_1596
+#AT_START_1597
+at_fn_group_banner 1597 'stp.at:267' \
   "STP.op.1.1 and STP.op.1.2" "                      " 101
 at_xfail=no
 (
-  $as_echo "1594. $at_setup_line: testing $at_desc ..."
+  $as_echo "1597. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254455,7 +255197,7 @@
 $as_echo "$at_srcdir/stp.at:278: ovstest test-stp test-stp-iol-op-1.1"
 at_fn_check_prepare_trace "stp.at:278"
 ( $at_check_trace; ovstest test-stp test-stp-iol-op-1.1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254468,13 +255210,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1594
-#AT_START_1595
-at_fn_group_banner 1595 'stp.at:281' \
+#AT_STOP_1597
+#AT_START_1598
+at_fn_group_banner 1598 'stp.at:281' \
   "STP.op.1.4: All Ports Initialized to Designated Ports" "" 101
 at_xfail=no
 (
-  $as_echo "1595. $at_setup_line: testing $at_desc ..."
+  $as_echo "1598. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254493,7 +255235,7 @@
 $as_echo "$at_srcdir/stp.at:293: ovstest test-stp test-stp-iol-op-1.4"
 at_fn_check_prepare_trace "stp.at:293"
 ( $at_check_trace; ovstest test-stp test-stp-iol-op-1.4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "stp|INFO|stp123: detected topology change.
@@ -254512,13 +255254,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1595
-#AT_START_1596
-at_fn_group_banner 1596 'stp.at:302' \
+#AT_STOP_1598
+#AT_START_1599
+at_fn_group_banner 1599 'stp.at:302' \
   "STP.op.3.1: Root Bridge Selection: Root ID Values" "" 101
 at_xfail=no
 (
-  $as_echo "1596. $at_setup_line: testing $at_desc ..."
+  $as_echo "1599. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254540,7 +255282,7 @@
 $as_echo "$at_srcdir/stp.at:317: ovstest test-stp test-stp-iol-op-3.1"
 at_fn_check_prepare_trace "stp.at:317"
 ( $at_check_trace; ovstest test-stp test-stp-iol-op-3.1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "stp|INFO|stp111: detected topology change.
@@ -254555,13 +255297,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1596
-#AT_START_1597
-at_fn_group_banner 1597 'stp.at:322' \
+#AT_STOP_1599
+#AT_START_1600
+at_fn_group_banner 1600 'stp.at:322' \
   "STP.op.3.3: Root Bridge Selection: Bridge ID Values" "" 101
 at_xfail=no
 (
-  $as_echo "1597. $at_setup_line: testing $at_desc ..."
+  $as_echo "1600. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254583,7 +255325,7 @@
 $as_echo "$at_srcdir/stp.at:337: ovstest test-stp test-stp-iol-op-3.3"
 at_fn_check_prepare_trace "stp.at:337"
 ( $at_check_trace; ovstest test-stp test-stp-iol-op-3.3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "stp|INFO|stp333: detected topology change.
@@ -254601,13 +255343,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1597
-#AT_START_1598
-at_fn_group_banner 1598 'stp.at:345' \
+#AT_STOP_1600
+#AT_START_1601
+at_fn_group_banner 1601 'stp.at:345' \
   "STP.op.3.3: Root Bridge Selection: Bridge ID Values" "" 101
 at_xfail=no
 (
-  $as_echo "1598. $at_setup_line: testing $at_desc ..."
+  $as_echo "1601. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -254629,7 +255371,7 @@
 $as_echo "$at_srcdir/stp.at:360: ovstest test-stp test-stp-iol-op-3.4"
 at_fn_check_prepare_trace "stp.at:360"
 ( $at_check_trace; ovstest test-stp test-stp-iol-op-3.4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "stp|INFO|stp333: detected topology change.
@@ -254647,13 +255389,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1598
-#AT_START_1599
-at_fn_group_banner 1599 'stp.at:380' \
+#AT_STOP_1601
+#AT_START_1602
+at_fn_group_banner 1602 'stp.at:380' \
   "STP - dummy interface" "                          " 101
 at_xfail=no
 (
-  $as_echo "1599. $at_setup_line: testing $at_desc ..."
+  $as_echo "1602. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # Create br0 with interfaces p1 and p7
@@ -254669,7 +255411,7 @@
 $as_echo "$at_srcdir/stp.at:384: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "stp.at:384"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254683,7 +255425,7 @@
 $as_echo "$at_srcdir/stp.at:384: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "stp.at:384"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -254705,7 +255447,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254720,7 +255462,7 @@
 $as_echo "$at_srcdir/stp.at:384: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "stp.at:384"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254735,7 +255477,7 @@
 $as_echo "$at_srcdir/stp.at:384: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "stp.at:384"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -254767,7 +255509,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254798,7 +255540,7 @@
                   fail-mode=secure -- \
    set port br1 other_config:stp-enable=false -- \
    set bridge br1 stp_enable=true --
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254815,7 +255557,7 @@
 $as_echo "$at_srcdir/stp.at:394: ovs-appctl vlog/set ofproto_dpif:dbg"
 at_fn_check_prepare_trace "stp.at:394"
 ( $at_check_trace; ovs-appctl vlog/set ofproto_dpif:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254837,7 +255579,7 @@
    set interface p1 type=dummy options:pstream=punix:$OVS_RUNDIR/p0.sock ofport_request=1 -- \
    set port p1 other_config:stp-enable=true -- \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254858,7 +255600,7 @@
    set interface p7 ofport_request=7 type=dummy -- \
    set port p7 other_config:stp-enable=false -- \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254879,7 +255621,7 @@
    set interface p2 type=dummy options:stream=unix:$OVS_RUNDIR/p0.sock ofport_request=2 -- \
    set port p2 other_config:stp-enable=true -- \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254900,7 +255642,7 @@
    set interface p8 ofport_request=8 type=dummy -- \
    set port p8 other_config:stp-enable=false -- \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254918,7 +255660,7 @@
 $as_echo "$at_srcdir/stp.at:415: ovs-ofctl add-flow br0 \"in_port=7 icmp actions=1\""
 at_fn_check_prepare_trace "stp.at:415"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=7 icmp actions=1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254933,7 +255675,7 @@
 $as_echo "$at_srcdir/stp.at:416: ovs-ofctl add-flow br0 \"in_port=1 icmp actions=7\""
 at_fn_check_prepare_trace "stp.at:416"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=1 icmp actions=7"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254948,7 +255690,7 @@
 $as_echo "$at_srcdir/stp.at:417: ovs-ofctl add-flow br1 \"in_port=8 icmp actions=2\""
 at_fn_check_prepare_trace "stp.at:417"
 ( $at_check_trace; ovs-ofctl add-flow br1 "in_port=8 icmp actions=2"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254963,7 +255705,7 @@
 $as_echo "$at_srcdir/stp.at:418: ovs-ofctl add-flow br1 \"in_port=2 icmp actions=8\""
 at_fn_check_prepare_trace "stp.at:418"
 ( $at_check_trace; ovs-ofctl add-flow br1 "in_port=2 icmp actions=8"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -254990,7 +255732,7 @@
 grep 'STP state change' | sed '
     s/.*ofproto_dpif|.*|//
 '
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255009,7 +255751,7 @@
 $as_echo "$at_srcdir/stp.at:430: ovs-appctl ofproto/trace ovs-dummy 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep STP"
 at_fn_check_prepare_notrace 'a shell pipeline' "stp.at:430"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep STP
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255026,7 +255768,7 @@
 $as_echo "$at_srcdir/stp.at:433: ovs-appctl ofproto/trace ovs-dummy 'in_port(8),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep STP"
 at_fn_check_prepare_notrace 'a shell pipeline' "stp.at:433"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(8),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep STP
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255062,7 +255804,7 @@
 grep 'STP state change' | sed '
     s/.*ofproto_dpif|.*|//
 '
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255085,7 +255827,7 @@
 $as_echo "$at_srcdir/stp.at:458: ovs-appctl ofproto/trace ovs-dummy 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep Datapath"
 at_fn_check_prepare_notrace 'a shell pipeline' "stp.at:458"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep Datapath
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255102,7 +255844,7 @@
 $as_echo "$at_srcdir/stp.at:461: ovs-appctl ofproto/trace ovs-dummy 'in_port(8),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep Datapath"
 at_fn_check_prepare_notrace 'a shell pipeline' "stp.at:461"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(8),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep Datapath
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255120,7 +255862,7 @@
 $as_echo "$at_srcdir/stp.at:465: check_logs "
 at_fn_check_prepare_trace "stp.at:465"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255135,7 +255877,7 @@
 $as_echo "$at_srcdir/stp.at:465: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "stp.at:465"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255150,7 +255892,7 @@
 $as_echo "$at_srcdir/stp.at:465: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "stp.at:465"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255165,13 +255907,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1599
-#AT_START_1600
-at_fn_group_banner 1600 'rstp.at:3' \
+#AT_STOP_1602
+#AT_START_1603
+at_fn_group_banner 1603 'rstp.at:3' \
   "RSTP Single bridge" "                             " 102
 at_xfail=no
 (
-  $as_echo "1600. $at_setup_line: testing $at_desc ..."
+  $as_echo "1603. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -255185,7 +255927,7 @@
 $as_echo "$at_srcdir/rstp.at:10: ovstest test-rstp test-rstp-num1"
 at_fn_check_prepare_trace "rstp.at:10"
 ( $at_check_trace; ovstest test-rstp test-rstp-num1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255198,13 +255940,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1600
-#AT_START_1601
-at_fn_group_banner 1601 'rstp.at:13' \
+#AT_STOP_1603
+#AT_START_1604
+at_fn_group_banner 1604 'rstp.at:13' \
   "RSTP Link failure" "                              " 102
 at_xfail=no
 (
-  $as_echo "1601. $at_setup_line: testing $at_desc ..."
+  $as_echo "1604. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -255227,7 +255969,7 @@
 $as_echo "$at_srcdir/rstp.at:29: ovstest test-rstp test-rstp-num2"
 at_fn_check_prepare_trace "rstp.at:29"
 ( $at_check_trace; ovstest test-rstp test-rstp-num2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255240,13 +255982,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1601
-#AT_START_1602
-at_fn_group_banner 1602 'rstp.at:32' \
+#AT_STOP_1604
+#AT_START_1605
+at_fn_group_banner 1605 'rstp.at:32' \
   "RSTP Double link Failure" "                       " 102
 at_xfail=no
 (
-  $as_echo "1602. $at_setup_line: testing $at_desc ..."
+  $as_echo "1605. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -255292,7 +256034,7 @@
 $as_echo "$at_srcdir/rstp.at:71: ovstest test-rstp test-rstp-num3"
 at_fn_check_prepare_trace "rstp.at:71"
 ( $at_check_trace; ovstest test-rstp test-rstp-num3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255305,13 +256047,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1602
-#AT_START_1603
-at_fn_group_banner 1603 'rstp.at:74' \
+#AT_STOP_1605
+#AT_START_1606
+at_fn_group_banner 1606 'rstp.at:74' \
   "RSTP example from IEEE 802.1D-2004 figures 17.4 and 17.5" "" 102
 at_xfail=no
 (
-  $as_echo "1603. $at_setup_line: testing $at_desc ..."
+  $as_echo "1606. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -255352,7 +256094,7 @@
 $as_echo "$at_srcdir/rstp.at:108: ovstest test-rstp test-rstp-ieee802.1d-2004-fig17.4"
 at_fn_check_prepare_trace "rstp.at:108"
 ( $at_check_trace; ovstest test-rstp test-rstp-ieee802.1d-2004-fig17.4
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255365,13 +256107,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1603
-#AT_START_1604
-at_fn_group_banner 1604 'rstp.at:111' \
+#AT_STOP_1606
+#AT_START_1607
+at_fn_group_banner 1607 'rstp.at:111' \
   "RSTP example from IEEE 802.1D-2004 figure 17.6" " " 102
 at_xfail=no
 (
-  $as_echo "1604. $at_setup_line: testing $at_desc ..."
+  $as_echo "1607. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -255395,7 +256137,7 @@
 $as_echo "$at_srcdir/rstp.at:128: ovstest test-rstp test-rstp-ieee802.1d-2004-fig17.6"
 at_fn_check_prepare_trace "rstp.at:128"
 ( $at_check_trace; ovstest test-rstp test-rstp-ieee802.1d-2004-fig17.6
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255408,13 +256150,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1604
-#AT_START_1605
-at_fn_group_banner 1605 'rstp.at:131' \
+#AT_STOP_1607
+#AT_START_1608
+at_fn_group_banner 1608 'rstp.at:131' \
   "RSTP example from IEEE 802.1D-2004 figure 17.7" " " 102
 at_xfail=no
 (
-  $as_echo "1605. $at_setup_line: testing $at_desc ..."
+  $as_echo "1608. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -255438,7 +256180,7 @@
 $as_echo "$at_srcdir/rstp.at:148: ovstest test-rstp test-rstp-ieee802.1d-2004-fig17.7"
 at_fn_check_prepare_trace "rstp.at:148"
 ( $at_check_trace; ovstest test-rstp test-rstp-ieee802.1d-2004-fig17.7
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255451,13 +256193,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1605
-#AT_START_1606
-at_fn_group_banner 1606 'rstp.at:163' \
+#AT_STOP_1608
+#AT_START_1609
+at_fn_group_banner 1609 'rstp.at:163' \
   "RSTP - dummy interface" "                         " 102
 at_xfail=no
 (
-  $as_echo "1606. $at_setup_line: testing $at_desc ..."
+  $as_echo "1609. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 # Create br0 with interfaces p1 and p7
@@ -255473,7 +256215,7 @@
 $as_echo "$at_srcdir/rstp.at:167: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "rstp.at:167"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255487,7 +256229,7 @@
 $as_echo "$at_srcdir/rstp.at:167: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
 at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "rstp.at:167"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -255509,7 +256251,7 @@
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255524,7 +256266,7 @@
 $as_echo "$at_srcdir/rstp.at:167: ovs-vsctl --no-wait init"
 at_fn_check_prepare_trace "rstp.at:167"
 ( $at_check_trace; ovs-vsctl --no-wait init
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255539,7 +256281,7 @@
 $as_echo "$at_srcdir/rstp.at:167: ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif"
 at_fn_check_prepare_trace "rstp.at:167"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -255571,7 +256313,7 @@
 /reconnect|INFO|/d
 /ofproto|INFO|using datapath ID/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255604,7 +256346,7 @@
    set port br1 other_config:rstp-enable=false -- \
    set bridge br1 rstp_enable=false -- \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255627,7 +256369,7 @@
    set interface p1 type=dummy options:pstream=punix:$OVS_RUNDIR/p0.sock ofport_request=1 -- \
    set port p1 other_config:rstp-enable=true -- \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255648,7 +256390,7 @@
    set interface p7 ofport_request=7 type=dummy -- \
    set port p7 other_config:rstp-enable=false -- \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255669,7 +256411,7 @@
    set interface p2 type=dummy options:stream=unix:$OVS_RUNDIR/p0.sock ofport_request=2 -- \
    set port p2 other_config:rstp-enable=false -- \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255690,7 +256432,7 @@
    set interface p8 ofport_request=8 type=dummy -- \
    set port p8 other_config:rstp-enable=false -- \
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255709,7 +256451,7 @@
 $as_echo "$at_srcdir/rstp.at:198: ovs-appctl netdev-dummy/set-admin-state p1 up"
 at_fn_check_prepare_trace "rstp.at:198"
 ( $at_check_trace; ovs-appctl netdev-dummy/set-admin-state p1 up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255730,7 +256472,7 @@
 $as_echo "$at_srcdir/rstp.at:205: ovs-vsctl set bridge br1 rstp_enable=true"
 at_fn_check_prepare_trace "rstp.at:205"
 ( $at_check_trace; ovs-vsctl set bridge br1 rstp_enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255748,7 +256490,7 @@
 $as_echo "$at_srcdir/rstp.at:209: ovs-ofctl add-flow br0 \"in_port=7 icmp actions=1\""
 at_fn_check_prepare_trace "rstp.at:209"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=7 icmp actions=1"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255763,7 +256505,7 @@
 $as_echo "$at_srcdir/rstp.at:210: ovs-ofctl add-flow br0 \"in_port=1 icmp actions=7\""
 at_fn_check_prepare_trace "rstp.at:210"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=1 icmp actions=7"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255778,7 +256520,7 @@
 $as_echo "$at_srcdir/rstp.at:211: ovs-ofctl add-flow br1 \"in_port=8 icmp actions=2\""
 at_fn_check_prepare_trace "rstp.at:211"
 ( $at_check_trace; ovs-ofctl add-flow br1 "in_port=8 icmp actions=2"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255793,7 +256535,7 @@
 $as_echo "$at_srcdir/rstp.at:212: ovs-ofctl add-flow br1 \"in_port=2 icmp actions=8\""
 at_fn_check_prepare_trace "rstp.at:212"
 ( $at_check_trace; ovs-ofctl add-flow br1 "in_port=2 icmp actions=8"
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255809,7 +256551,7 @@
 $as_echo "$at_srcdir/rstp.at:214: ovs-vsctl set port p2 other_config:rstp-enable=true"
 at_fn_check_prepare_trace "rstp.at:214"
 ( $at_check_trace; ovs-vsctl set port p2 other_config:rstp-enable=true
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255835,7 +256577,7 @@
 ' | wc -l` -ge 2
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -255856,7 +256598,7 @@
 grep 'STP state changed' | sed '
     s/.*ofproto_dpif|.*|//
 '
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255875,7 +256617,7 @@
 $as_echo "$at_srcdir/rstp.at:222: ovs-appctl ofproto/trace ovs-dummy 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep STP"
 at_fn_check_prepare_notrace 'a shell pipeline' "rstp.at:222"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep STP
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255892,7 +256634,7 @@
 $as_echo "$at_srcdir/rstp.at:225: ovs-appctl ofproto/trace ovs-dummy 'in_port(8),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep STP"
 at_fn_check_prepare_notrace 'a shell pipeline' "rstp.at:225"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(8),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep STP
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255913,7 +256655,7 @@
 $as_echo "$at_srcdir/rstp.at:232: ovs-appctl netdev-dummy/set-admin-state p2 up"
 at_fn_check_prepare_trace "rstp.at:232"
 ( $at_check_trace; ovs-appctl netdev-dummy/set-admin-state p2 up
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255946,7 +256688,7 @@
 ' | wc -l` -ge 4
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -255967,7 +256709,7 @@
 grep 'STP state changed' | sed '
     s/.*ofproto_dpif|.*|//
 '
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -255988,7 +256730,7 @@
 $as_echo "$at_srcdir/rstp.at:249: ovs-appctl ofproto/trace ovs-dummy 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep Datapath"
 at_fn_check_prepare_notrace 'a shell pipeline' "rstp.at:249"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(7),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep Datapath
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256005,7 +256747,7 @@
 $as_echo "$at_srcdir/rstp.at:252: ovs-appctl ofproto/trace ovs-dummy 'in_port(8),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep Datapath"
 at_fn_check_prepare_notrace 'a shell pipeline' "rstp.at:252"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(8),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' | grep Datapath
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256023,7 +256765,7 @@
 $as_echo "$at_srcdir/rstp.at:256: ovs-vsctl del-br br1"
 at_fn_check_prepare_trace "rstp.at:256"
 ( $at_check_trace; ovs-vsctl del-br br1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256039,7 +256781,7 @@
 $as_echo "$at_srcdir/rstp.at:258: ovs-vsctl del-port br0 p7"
 at_fn_check_prepare_trace "rstp.at:258"
 ( $at_check_trace; ovs-vsctl del-port br0 p7
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256054,7 +256796,7 @@
 $as_echo "$at_srcdir/rstp.at:259: ovs-vsctl del-port br0 p1"
 at_fn_check_prepare_trace "rstp.at:259"
 ( $at_check_trace; ovs-vsctl del-port br0 p1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256070,7 +256812,7 @@
 $as_echo "$at_srcdir/rstp.at:261: check_logs "
 at_fn_check_prepare_trace "rstp.at:261"
 ( $at_check_trace; check_logs
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256085,7 +256827,7 @@
 $as_echo "$at_srcdir/rstp.at:261: ovs-appctl -t ovs-vswitchd exit"
 at_fn_check_prepare_trace "rstp.at:261"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256100,7 +256842,7 @@
 $as_echo "$at_srcdir/rstp.at:261: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "rstp.at:261"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256115,13 +256857,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1606
-#AT_START_1607
-at_fn_group_banner 1607 'vlog.at:3' \
+#AT_STOP_1609
+#AT_START_1610
+at_fn_group_banner 1610 'vlog.at:3' \
   "vlog - Python" "                                  " 103
 at_xfail=no
 (
-  $as_echo "1607. $at_setup_line: testing $at_desc ..."
+  $as_echo "1610. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "vlog.at:4" >"$at_check_line_file"
@@ -256135,7 +256877,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vlog.at:7"
 ( $at_check_trace; $PYTHON $srcdir/test-vlog.py --log-file log_file \
 -v dbg module_1:info module_2:warn syslog:off 2>stderr_log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256155,7 +256897,7 @@
 ( $at_check_trace; sed -e 's/.*-.*-.*T..:..:..Z |//' \
 -e 's/File ".*", line [0-9][0-9]*,/File , line ,/' \
 stderr_log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256259,13 +257001,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1607
-#AT_START_1608
-at_fn_group_banner 1608 'vlog.at:104' \
+#AT_STOP_1610
+#AT_START_1611
+at_fn_group_banner 1611 'vlog.at:104' \
   "vlog - vlog/reopen - Python" "                    " 103
 at_xfail=no
 (
-  $as_echo "1608. $at_setup_line: testing $at_desc ..."
+  $as_echo "1611. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "vlog.at:105" >"$at_check_line_file"
@@ -256287,7 +257029,7 @@
 $as_echo "$at_srcdir/vlog.at:114: \$PYTHON \$srcdir/test-unixctl.py --log-file=\`pwd\`/log --pidfile --detach"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vlog.at:114"
 ( $at_check_trace; $PYTHON $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile --detach
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256303,7 +257045,7 @@
 $as_echo "$at_srcdir/vlog.at:116: ovs-appctl --timeout 20 -t test-unixctl.py log message"
 at_fn_check_prepare_trace "vlog.at:116"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py log message
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256319,7 +257061,7 @@
 $as_echo "$at_srcdir/vlog.at:118: ovs-appctl --timeout 20 -t test-unixctl.py log message2"
 at_fn_check_prepare_trace "vlog.at:118"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py log message2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256334,7 +257076,7 @@
 $as_echo "$at_srcdir/vlog.at:119: ovs-appctl --timeout 20 -t test-unixctl.py vlog/reopen"
 at_fn_check_prepare_trace "vlog.at:119"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py vlog/reopen
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256349,7 +257091,7 @@
 $as_echo "$at_srcdir/vlog.at:120: ovs-appctl --timeout 20 -t test-unixctl.py log message3"
 at_fn_check_prepare_trace "vlog.at:120"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py log message3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256364,7 +257106,7 @@
 $as_echo "$at_srcdir/vlog.at:121: ovs-appctl --timeout 20 -t test-unixctl.py exit"
 at_fn_check_prepare_trace "vlog.at:121"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256380,7 +257122,7 @@
 $as_echo "$at_srcdir/vlog.at:123: sed 's/.*|//' log.old"
 at_fn_check_prepare_notrace 'a shell pipeline' "vlog.at:123"
 ( $at_check_trace; sed 's/.*|//' log.old
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256399,7 +257141,7 @@
 $as_echo "$at_srcdir/vlog.at:128: sed 's/.*|//' log"
 at_fn_check_prepare_notrace 'a shell pipeline' "vlog.at:128"
 ( $at_check_trace; sed 's/.*|//' log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256416,13 +257158,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1608
-#AT_START_1609
-at_fn_group_banner 1609 'vlog.at:133' \
+#AT_STOP_1611
+#AT_START_1612
+at_fn_group_banner 1612 'vlog.at:133' \
   "vlog - vlog/reopen without log file - Python" "   " 103
 at_xfail=no
 (
-  $as_echo "1609. $at_setup_line: testing $at_desc ..."
+  $as_echo "1612. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "vlog.at:134" >"$at_check_line_file"
@@ -256442,7 +257184,7 @@
 $as_echo "$at_srcdir/vlog.at:141: \$PYTHON \$srcdir/test-unixctl.py --pidfile --detach"
 at_fn_check_prepare_dynamic "$PYTHON $srcdir/test-unixctl.py --pidfile --detach" "vlog.at:141"
 ( $at_check_trace; $PYTHON $srcdir/test-unixctl.py --pidfile --detach
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256456,7 +257198,7 @@
 $as_echo "$at_srcdir/vlog.at:143: ovs-appctl --timeout 20 -t test-unixctl.py vlog/reopen"
 at_fn_check_prepare_trace "vlog.at:143"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py vlog/reopen
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256471,13 +257213,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1609
-#AT_START_1610
-at_fn_group_banner 1610 'vlog.at:151' \
+#AT_STOP_1612
+#AT_START_1613
+at_fn_group_banner 1613 'vlog.at:151' \
   "vlog - vlog/reopen can't reopen log file - Python" "" 103
 at_xfail=no
 (
-  $as_echo "1610. $at_setup_line: testing $at_desc ..."
+  $as_echo "1613. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "vlog.at:152" >"$at_check_line_file"
@@ -256506,7 +257248,7 @@
 $as_echo "$at_srcdir/vlog.at:164: \$PYTHON \$srcdir/test-unixctl.py --log-file=\`pwd\`/log --pidfile --detach"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vlog.at:164"
 ( $at_check_trace; $PYTHON $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile --detach
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256519,7 +257261,7 @@
 $as_echo "$at_srcdir/vlog.at:165: ovs-appctl --timeout 20 -t test-unixctl.py log message"
 at_fn_check_prepare_trace "vlog.at:165"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py log message
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256534,7 +257276,7 @@
 $as_echo "$at_srcdir/vlog.at:168: ovs-appctl --timeout 20 -t test-unixctl.py vlog/reopen"
 at_fn_check_prepare_trace "vlog.at:168"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py vlog/reopen
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256547,7 +257289,7 @@
 $as_echo "$at_srcdir/vlog.at:169: ovs-appctl --timeout 20 -t test-unixctl.py log message2"
 at_fn_check_prepare_trace "vlog.at:169"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py log message2
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256561,7 +257303,7 @@
 $as_echo "$at_srcdir/vlog.at:171: ovs-appctl --timeout 20 -t test-unixctl.py vlog/reopen"
 at_fn_check_prepare_trace "vlog.at:171"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py vlog/reopen
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256574,7 +257316,7 @@
 $as_echo "$at_srcdir/vlog.at:172: ovs-appctl --timeout 20 -t test-unixctl.py log message3"
 at_fn_check_prepare_trace "vlog.at:172"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py log message3
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256587,7 +257329,7 @@
 $as_echo "$at_srcdir/vlog.at:173: ovs-appctl --timeout 20 -t test-unixctl.py exit"
 at_fn_check_prepare_trace "vlog.at:173"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256600,7 +257342,7 @@
 $as_echo "$at_srcdir/vlog.at:174: sed 's/.*|//' log.old"
 at_fn_check_prepare_notrace 'a shell pipeline' "vlog.at:174"
 ( $at_check_trace; sed 's/.*|//' log.old
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256616,7 +257358,7 @@
 $as_echo "$at_srcdir/vlog.at:178: sed 's/.*|//' log"
 at_fn_check_prepare_notrace 'a shell pipeline' "vlog.at:178"
 ( $at_check_trace; sed 's/.*|//' log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256631,13 +257373,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1610
-#AT_START_1611
-at_fn_group_banner 1611 'vlog.at:183' \
+#AT_STOP_1613
+#AT_START_1614
+at_fn_group_banner 1614 'vlog.at:183' \
   "vlog - vlog/set and vlog/list - Python" "         " 103
 at_xfail=no
 (
-  $as_echo "1611. $at_setup_line: testing $at_desc ..."
+  $as_echo "1614. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "vlog.at:184" >"$at_check_line_file"
@@ -256658,7 +257400,7 @@
 $as_echo "$at_srcdir/vlog.at:192: \$PYTHON \$srcdir/test-unixctl.py --log-file=\`pwd\`/log --pidfile --detach"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vlog.at:192"
 ( $at_check_trace; $PYTHON $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile --detach
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256673,7 +257415,7 @@
 $as_echo "$at_srcdir/vlog.at:194: ovs-appctl --timeout 20 -t test-unixctl.py vlog/list"
 at_fn_check_prepare_trace "vlog.at:194"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py vlog/list
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256700,7 +257442,7 @@
 $as_echo "$at_srcdir/vlog.at:208: ovs-appctl --timeout 20 -t test-unixctl.py vlog/set daemon:syslog:err"
 at_fn_check_prepare_trace "vlog.at:208"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py vlog/set daemon:syslog:err
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256714,7 +257456,7 @@
 $as_echo "$at_srcdir/vlog.at:209: ovs-appctl --timeout 20 -t test-unixctl.py vlog/set file:dbg"
 at_fn_check_prepare_trace "vlog.at:209"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py vlog/set file:dbg
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256728,7 +257470,7 @@
 $as_echo "$at_srcdir/vlog.at:210: ovs-appctl --timeout 20 -t test-unixctl.py vlog/set nonexistent"
 at_fn_check_prepare_trace "vlog.at:210"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py vlog/set nonexistent
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256744,7 +257486,7 @@
 $as_echo "$at_srcdir/vlog.at:213: ovs-appctl --timeout 20 -t test-unixctl.py vlog/list"
 at_fn_check_prepare_trace "vlog.at:213"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py vlog/list
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256771,7 +257513,7 @@
 $as_echo "$at_srcdir/vlog.at:227: ovs-appctl --timeout 20 -t test-unixctl.py vlog/set pattern"
 at_fn_check_prepare_trace "vlog.at:227"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py vlog/set pattern
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256787,7 +257529,7 @@
 $as_echo "$at_srcdir/vlog.at:230: ovs-appctl --timeout 20 -t test-unixctl.py vlog/set pattern:nonexistent"
 at_fn_check_prepare_trace "vlog.at:230"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py vlog/set pattern:nonexistent
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256803,7 +257545,7 @@
 $as_echo "$at_srcdir/vlog.at:233: ovs-appctl --timeout 20 -t test-unixctl.py vlog/set pattern:file:'I<3OVS|%m'"
 at_fn_check_prepare_notrace 'a shell pipeline' "vlog.at:233"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py vlog/set pattern:file:'I<3OVS|%m'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256817,7 +257559,7 @@
 $as_echo "$at_srcdir/vlog.at:234: ovs-appctl --timeout 20 -t test-unixctl.py log patterntest"
 at_fn_check_prepare_trace "vlog.at:234"
 ( $at_check_trace; ovs-appctl --timeout 20 -t test-unixctl.py log patterntest
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256831,7 +257573,7 @@
 $as_echo "$at_srcdir/vlog.at:235: grep -q 'I<3OVS' log"
 at_fn_check_prepare_trace "vlog.at:235"
 ( $at_check_trace; grep -q 'I<3OVS' log
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256845,13 +257587,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1611
-#AT_START_1612
-at_fn_group_banner 1612 'vlog.at:238' \
+#AT_STOP_1614
+#AT_START_1615
+at_fn_group_banner 1615 'vlog.at:238' \
   "vlog - RFC5424 facility" "                        " 103
 at_xfail=no
 (
-  $as_echo "1612. $at_setup_line: testing $at_desc ..."
+  $as_echo "1615. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
@@ -256869,7 +257611,7 @@
 $as_echo "$at_srcdir/vlog.at:247: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "vlog.at:247"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256887,7 +257629,7 @@
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile \
           --remote=punix:$OVS_RUNDIR/db.sock -vPATTERN:file:"<%B>1 %A %m" \
           --log-file
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -256900,7 +257642,7 @@
 $as_echo "$at_srcdir/vlog.at:252: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "vlog.at:252"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256915,7 +257657,7 @@
 $as_echo "$at_srcdir/vlog.at:255: cat ovsdb-server.log | head -1 | awk '{print \$1}'"
 at_fn_check_prepare_notrace 'a shell pipeline' "vlog.at:255"
 ( $at_check_trace; cat ovsdb-server.log | head -1 | awk '{print $1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256936,7 +257678,7 @@
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile \
           --remote=punix:$OVS_RUNDIR/db.sock -vPATTERN:file:"<%B>1 %A %m" \
           -vFACILITY:daemon --log-file
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
@@ -256950,7 +257692,7 @@
 $as_echo "$at_srcdir/vlog.at:263: cat ovsdb-server.log | head -1 | awk '{print \$1}'"
 at_fn_check_prepare_notrace 'a shell pipeline' "vlog.at:263"
 ( $at_check_trace; cat ovsdb-server.log | head -1 | awk '{print $1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256966,7 +257708,7 @@
 $as_echo "$at_srcdir/vlog.at:266: ovs-appctl -t ovsdb-server vlog/set FACILITY:invalid"
 at_fn_check_prepare_trace "vlog.at:266"
 ( $at_check_trace; ovs-appctl -t ovsdb-server vlog/set FACILITY:invalid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "invalid facility
@@ -256983,7 +257725,7 @@
 $as_echo "$at_srcdir/vlog.at:271: ovs-appctl -t ovsdb-server vlog/set FACILITY:local7"
 at_fn_check_prepare_trace "vlog.at:271"
 ( $at_check_trace; ovs-appctl -t ovsdb-server vlog/set FACILITY:local7
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -256996,7 +257738,7 @@
 $as_echo "$at_srcdir/vlog.at:272: ovs-appctl -t ovsdb-server vlog/set ANY:file:DBG"
 at_fn_check_prepare_trace "vlog.at:272"
 ( $at_check_trace; ovs-appctl -t ovsdb-server vlog/set ANY:file:DBG
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257009,7 +257751,7 @@
 $as_echo "$at_srcdir/vlog.at:273: ovs-appctl -t ovsdb-server exit"
 at_fn_check_prepare_trace "vlog.at:273"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257023,7 +257765,7 @@
 $as_echo "$at_srcdir/vlog.at:275: cat ovsdb-server.log | tail -1 | awk '{print \$1}'"
 at_fn_check_prepare_notrace 'a shell pipeline' "vlog.at:275"
 ( $at_check_trace; cat ovsdb-server.log | tail -1 | awk '{print $1}'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257038,13 +257780,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1612
-#AT_START_1613
-at_fn_group_banner 1613 'vlog.at:279' \
+#AT_STOP_1615
+#AT_START_1616
+at_fn_group_banner 1616 'vlog.at:279' \
   "vlog - RFC5424 facility - Python" "               " 103
 at_xfail=no
 (
-  $as_echo "1613. $at_setup_line: testing $at_desc ..."
+  $as_echo "1616. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 $as_echo "vlog.at:280" >"$at_check_line_file"
@@ -257066,7 +257808,7 @@
 at_fn_check_prepare_notrace 'a `...` command substitution' "vlog.at:287"
 ( $at_check_trace; $PYTHON $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile \
 -vFACILITY:invalid --detach
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "test-unixctl.py: processing \"FACILITY:invalid\": Facility invalid is invalid
@@ -257084,7 +257826,7 @@
 at_fn_check_prepare_notrace 'a `...` command substitution' "vlog.at:291"
 ( $at_check_trace; $PYTHON $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile \
 -vFACILITY:daemon --detach
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257098,7 +257840,7 @@
 $as_echo "$at_srcdir/vlog.at:294: ovs-appctl -t test-unixctl.py vlog/set FACILITY:invalid"
 at_fn_check_prepare_trace "vlog.at:294"
 ( $at_check_trace; ovs-appctl -t test-unixctl.py vlog/set FACILITY:invalid
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257114,7 +257856,7 @@
 $as_echo "$at_srcdir/vlog.at:298: ovs-appctl -t test-unixctl.py vlog/set FACILITY:local0"
 at_fn_check_prepare_trace "vlog.at:298"
 ( $at_check_trace; ovs-appctl -t test-unixctl.py vlog/set FACILITY:local0
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257127,13 +257869,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1613
-#AT_START_1614
-at_fn_group_banner 1614 'vtep-ctl.at:136' \
+#AT_STOP_1616
+#AT_START_1617
+at_fn_group_banner 1617 'vtep-ctl.at:136' \
   "add-ps a" "                                       " 104
 at_xfail=no
 (
-  $as_echo "1614. $at_setup_line: testing $at_desc ..."
+  $as_echo "1617. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -257142,7 +257884,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:138: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:138"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257163,7 +257905,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257176,7 +257918,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:138: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:138"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257191,7 +257933,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:139"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ps a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257203,7 +257945,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:139: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:139"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257220,7 +257962,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257242,7 +257984,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:140"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257256,7 +257998,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:140: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:140"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257273,7 +258015,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257296,7 +258038,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:140"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257310,7 +258052,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:140: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:140"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257327,7 +258069,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257350,7 +258092,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:140"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257362,7 +258104,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:140: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:140"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257379,7 +258121,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257401,7 +258143,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:140"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257413,7 +258155,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:140: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:140"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257430,7 +258172,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257451,7 +258193,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:141: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:141"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257468,7 +258210,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257484,13 +258226,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1614
-#AT_START_1615
-at_fn_group_banner 1615 'vtep-ctl.at:144' \
+#AT_STOP_1617
+#AT_START_1618
+at_fn_group_banner 1618 'vtep-ctl.at:144' \
   "add-ps a, add-ps a" "                             " 104
 at_xfail=no
 (
-  $as_echo "1615. $at_setup_line: testing $at_desc ..."
+  $as_echo "1618. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -257499,7 +258241,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:146: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:146"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257520,7 +258262,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257533,7 +258275,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:146: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:146"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257548,7 +258290,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:147"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ps a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257560,7 +258302,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:147: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:147"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257577,7 +258319,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257599,7 +258341,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:148"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ps a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "vtep-ctl: cannot create physical switch a because it already exists
@@ -257613,7 +258355,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:148: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:148"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257630,7 +258372,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257651,7 +258393,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:151: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:151"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257668,7 +258410,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257684,13 +258426,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1615
-#AT_START_1616
-at_fn_group_banner 1616 'vtep-ctl.at:154' \
+#AT_STOP_1618
+#AT_START_1619
+at_fn_group_banner 1619 'vtep-ctl.at:154' \
   "add-ps a, add-ps b" "                             " 104
 at_xfail=no
 (
-  $as_echo "1616. $at_setup_line: testing $at_desc ..."
+  $as_echo "1619. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -257699,7 +258441,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:156: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:156"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257720,7 +258462,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257733,7 +258475,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:156: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:156"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257750,7 +258492,7 @@
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ps a
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ps b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257762,7 +258504,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:157: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:157"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257779,7 +258521,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257801,7 +258543,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:159"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257816,7 +258558,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:159: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:159"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257833,7 +258575,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257856,7 +258598,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:159"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257870,7 +258612,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:159: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:159"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257887,7 +258629,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257910,7 +258652,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:159"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257922,7 +258664,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:159: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:159"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257939,7 +258681,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257960,7 +258702,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:159"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -257972,7 +258714,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:159: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:159"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -257989,7 +258731,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258011,7 +258753,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:159"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258023,7 +258765,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:159: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:159"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258040,7 +258782,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258061,7 +258803,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:160: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:160"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258078,7 +258820,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258094,13 +258836,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1616
-#AT_START_1617
-at_fn_group_banner 1617 'vtep-ctl.at:163' \
+#AT_STOP_1619
+#AT_START_1620
+at_fn_group_banner 1620 'vtep-ctl.at:163' \
   "add-ps a, add-ps b, del-ps a" "                   " 104
 at_xfail=no
 (
-  $as_echo "1617. $at_setup_line: testing $at_desc ..."
+  $as_echo "1620. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -258109,7 +258851,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:165: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:165"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258130,7 +258872,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258143,7 +258885,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:165: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:165"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258162,7 +258904,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ps b
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket del-ps a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258174,7 +258916,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:166: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:166"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258191,7 +258933,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258213,7 +258955,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:168"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258227,7 +258969,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:168: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:168"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258244,7 +258986,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258267,7 +259009,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:168"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258281,7 +259023,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:168: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:168"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258298,7 +259040,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258321,7 +259063,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:168"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258333,7 +259075,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:168: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:168"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258350,7 +259092,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258372,7 +259114,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:168"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258384,7 +259126,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:168: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:168"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258401,7 +259143,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258422,7 +259164,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:169: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:169"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258439,7 +259181,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258455,13 +259197,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1617
-#AT_START_1618
-at_fn_group_banner 1618 'vtep-ctl.at:172' \
+#AT_STOP_1620
+#AT_START_1621
+at_fn_group_banner 1621 'vtep-ctl.at:172' \
   "add-ps a, del-ps a, add-ps a" "                   " 104
 at_xfail=no
 (
-  $as_echo "1618. $at_setup_line: testing $at_desc ..."
+  $as_echo "1621. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -258470,7 +259212,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:174: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:174"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258491,7 +259233,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258504,7 +259246,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:174: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:174"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258517,7 +259259,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:175: vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline  -- add-ps a -- del-ps a -- add-ps a"
 at_fn_check_prepare_trace "vtep-ctl.at:175"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline  -- add-ps a -- del-ps a -- add-ps a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258533,7 +259275,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:175: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:175"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258550,7 +259292,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258572,7 +259314,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:182"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258586,7 +259328,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:182: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:182"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258603,7 +259345,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258626,7 +259368,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:182"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258640,7 +259382,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:182: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:182"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258657,7 +259399,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258680,7 +259422,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:182"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258692,7 +259434,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:182: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:182"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258709,7 +259451,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258731,7 +259473,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:182"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258743,7 +259485,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:182: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:182"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258760,7 +259502,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258781,7 +259523,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:183: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:183"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258798,7 +259540,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258814,13 +259556,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1618
-#AT_START_1619
-at_fn_group_banner 1619 'vtep-ctl.at:186' \
+#AT_STOP_1621
+#AT_START_1622
+at_fn_group_banner 1622 'vtep-ctl.at:186' \
   "add-ps a, add-port a a1, add-port a a2" "         " 104
 at_xfail=no
 (
-  $as_echo "1619. $at_setup_line: testing $at_desc ..."
+  $as_echo "1622. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -258829,7 +259571,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:188: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:188"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258850,7 +259592,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258863,7 +259605,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:188: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:188"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258884,7 +259626,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-port a a1
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-port a a2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258896,7 +259638,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:189: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:189"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258913,7 +259655,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258935,7 +259677,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:194"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -258949,7 +259691,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:194: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:194"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258966,7 +259708,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -258989,7 +259731,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:194"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259003,7 +259745,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:194: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:194"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259020,7 +259762,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259043,7 +259785,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:194"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259055,7 +259797,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:194: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:194"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259072,7 +259814,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259094,7 +259836,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:194"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259106,7 +259848,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:194: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:194"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259123,7 +259865,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259145,7 +259887,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:195"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259160,7 +259902,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:195: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:195"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259177,7 +259919,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259200,7 +259942,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:195"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259214,7 +259956,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:195: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:195"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259231,7 +259973,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259252,7 +259994,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:196: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:196"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259269,7 +260011,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259285,13 +260027,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1619
-#AT_START_1620
-at_fn_group_banner 1620 'vtep-ctl.at:199' \
+#AT_STOP_1622
+#AT_START_1623
+at_fn_group_banner 1623 'vtep-ctl.at:199' \
   "add-ps a, add-port a a1, add-port a a1" "         " 104
 at_xfail=no
 (
-  $as_echo "1620. $at_setup_line: testing $at_desc ..."
+  $as_echo "1623. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -259300,7 +260042,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:201: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:201"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259321,7 +260063,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259334,7 +260076,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:201: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:201"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259351,7 +260093,7 @@
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ps a
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-port a a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259363,7 +260105,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:202: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:202"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259380,7 +260122,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259402,7 +260144,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:205"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-port a a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "vtep-ctl: cannot create a port named a1 on a because a port with that name already exists
@@ -259416,7 +260158,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:205: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:205"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259433,7 +260175,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259454,7 +260196,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:208: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:208"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259471,7 +260213,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259487,13 +260229,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1620
-#AT_START_1621
-at_fn_group_banner 1621 'vtep-ctl.at:211' \
+#AT_STOP_1623
+#AT_START_1624
+at_fn_group_banner 1624 'vtep-ctl.at:211' \
   "add-ps a b, add-port a a1, add-port b b1, del-ps a" "" 104
 at_xfail=no
 (
-  $as_echo "1621. $at_setup_line: testing $at_desc ..."
+  $as_echo "1624. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -259502,7 +260244,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:213: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:213"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259523,7 +260265,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259536,7 +260278,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:213: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:213"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259549,7 +260291,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:214: vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline  -- add-ps a -- add-ps b -- add-port a a1 -- add-port b b1 -- --if-exists del-port b b2 -- del-ps a"
 at_fn_check_prepare_trace "vtep-ctl.at:214"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline  -- add-ps a -- add-ps b -- add-port a a1 -- add-port b b1 -- --if-exists del-port b b2 -- del-ps a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259568,7 +260310,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:214: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:214"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259585,7 +260327,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259607,7 +260349,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:227"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259621,7 +260363,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:227: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:227"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259638,7 +260380,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259661,7 +260403,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:227"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259675,7 +260417,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:227: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:227"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259692,7 +260434,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259715,7 +260457,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:227"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259727,7 +260469,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:227: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:227"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259744,7 +260486,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259766,7 +260508,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:227"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259778,7 +260520,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:227: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:227"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259795,7 +260537,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259817,7 +260559,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:228"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259831,7 +260573,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:228: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:228"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259848,7 +260590,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259871,7 +260613,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:228"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -259885,7 +260627,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:228: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:228"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259902,7 +260644,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259923,7 +260665,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:229: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:229"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259940,7 +260682,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259956,13 +260698,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1621
-#AT_START_1622
-at_fn_group_banner 1622 'vtep-ctl.at:232' \
+#AT_STOP_1624
+#AT_START_1625
+at_fn_group_banner 1625 'vtep-ctl.at:232' \
   "add-ps a b, add-port a a1, add-port b b1, del-port a a1" "" 104
 at_xfail=no
 (
-  $as_echo "1622. $at_setup_line: testing $at_desc ..."
+  $as_echo "1625. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -259971,7 +260713,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:234: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:234"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -259992,7 +260734,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260005,7 +260747,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:234: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:234"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260028,7 +260770,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --may-exist add-port b b1
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket del-port a a1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260040,7 +260782,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:235: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:235"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260057,7 +260799,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260079,7 +260821,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:241"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --may-exist add-port b b1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260091,7 +260833,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:241: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:241"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260108,7 +260850,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260130,7 +260872,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:243"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260145,7 +260887,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:243: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:243"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260162,7 +260904,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260185,7 +260927,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:243"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260199,7 +260941,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:243: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:243"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260216,7 +260958,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260239,7 +260981,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:243"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260251,7 +260993,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:243: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:243"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260268,7 +261010,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260289,7 +261031,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:243"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260301,7 +261043,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:243: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:243"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260318,7 +261060,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260340,7 +261082,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:243"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260352,7 +261094,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:243: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:243"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260369,7 +261111,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260391,7 +261133,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:244"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260403,7 +261145,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:244: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:244"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260420,7 +261162,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260443,7 +261185,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:244"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260457,7 +261199,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:244: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:244"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260474,7 +261216,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260496,7 +261238,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:245"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260510,7 +261252,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:245: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:245"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260527,7 +261269,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260550,7 +261292,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:245"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260564,7 +261306,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:245: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:245"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260581,7 +261323,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260602,7 +261344,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:246: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:246"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260619,7 +261361,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260635,13 +261377,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1622
-#AT_START_1623
-at_fn_group_banner 1623 'vtep-ctl.at:249' \
+#AT_STOP_1625
+#AT_START_1626
+at_fn_group_banner 1626 'vtep-ctl.at:249' \
   "add-ps a b, add-port a p1, add-port b p1, del-port a p1" "" 104
 at_xfail=no
 (
-  $as_echo "1623. $at_setup_line: testing $at_desc ..."
+  $as_echo "1626. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -260650,7 +261392,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:251: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:251"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260671,7 +261413,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260684,7 +261426,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:251: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:251"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260705,7 +261447,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-port a p1
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-port b p1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260717,7 +261459,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:252: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:252"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260734,7 +261476,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260756,7 +261498,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:257"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260771,7 +261513,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:257: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:257"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260788,7 +261530,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260811,7 +261553,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:257"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260825,7 +261567,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:257: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:257"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260842,7 +261584,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260865,7 +261607,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:257"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260877,7 +261619,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:257: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:257"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260894,7 +261636,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260915,7 +261657,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:257"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260927,7 +261669,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:257: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:257"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260944,7 +261686,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260966,7 +261708,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:257"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -260978,7 +261720,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:257: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:257"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -260995,7 +261737,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261017,7 +261759,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:258"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261031,7 +261773,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:258: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:258"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261048,7 +261790,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261071,7 +261813,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:258"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261085,7 +261827,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:258: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:258"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261102,7 +261844,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261124,7 +261866,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:259"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261138,7 +261880,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:259: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:259"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261155,7 +261897,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261178,7 +261920,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:259"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261192,7 +261934,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:259: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:259"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261209,7 +261951,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261231,7 +261973,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:260"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket del-port a p1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261243,7 +261985,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:260: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:260"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261260,7 +262002,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261282,7 +262024,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:262"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261297,7 +262039,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:262: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:262"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261314,7 +262056,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261337,7 +262079,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:262"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261351,7 +262093,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:262: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:262"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261368,7 +262110,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261391,7 +262133,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:262"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261403,7 +262145,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:262: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:262"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261420,7 +262162,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261441,7 +262183,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:262"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261453,7 +262195,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:262: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:262"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261470,7 +262212,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261492,7 +262234,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:262"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261504,7 +262246,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:262: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:262"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261521,7 +262263,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261543,7 +262285,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:263"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261555,7 +262297,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:263: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:263"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261572,7 +262314,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261595,7 +262337,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:263"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ports a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261609,7 +262351,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:263: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:263"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261626,7 +262368,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261648,7 +262390,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:264"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261662,7 +262404,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:264: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:264"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261679,7 +262421,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261702,7 +262444,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:264"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ports b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261716,7 +262458,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:264: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:264"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261733,7 +262475,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261754,7 +262496,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:265: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:265"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261771,7 +262513,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261787,13 +262529,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1623
-#AT_START_1624
-at_fn_group_banner 1624 'vtep-ctl.at:272' \
+#AT_STOP_1626
+#AT_START_1627
+at_fn_group_banner 1627 'vtep-ctl.at:272' \
   "add-ls a" "                                       " 105
 at_xfail=no
 (
-  $as_echo "1624. $at_setup_line: testing $at_desc ..."
+  $as_echo "1627. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -261802,7 +262544,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:274: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:274"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261823,7 +262565,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261836,7 +262578,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:274: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:274"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261851,7 +262593,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:275"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261863,7 +262605,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:275: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:275"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261880,7 +262622,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261902,7 +262644,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:276"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261916,7 +262658,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:276: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:276"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261933,7 +262675,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261956,7 +262698,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:276"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -261970,7 +262712,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:276: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:276"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -261987,7 +262729,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262010,7 +262752,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:276"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262022,7 +262764,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:276: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:276"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262039,7 +262781,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262061,7 +262803,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:276"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262073,7 +262815,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:276: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:276"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262090,7 +262832,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262111,7 +262853,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:277: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:277"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262128,7 +262870,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262144,13 +262886,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1624
-#AT_START_1625
-at_fn_group_banner 1625 'vtep-ctl.at:280' \
+#AT_STOP_1627
+#AT_START_1628
+at_fn_group_banner 1628 'vtep-ctl.at:280' \
   "add-ls a, add-ls a" "                             " 105
 at_xfail=no
 (
-  $as_echo "1625. $at_setup_line: testing $at_desc ..."
+  $as_echo "1628. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -262159,7 +262901,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:282: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:282"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262180,7 +262922,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262193,7 +262935,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:282: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:282"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262208,7 +262950,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:283"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262220,7 +262962,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:283: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:283"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262237,7 +262979,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262259,7 +263001,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:284"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo >>"$at_stderr"; $as_echo "vtep-ctl: cannot create logical switch a because it already exists
@@ -262273,7 +263015,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:284: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:284"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262290,7 +263032,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262311,7 +263053,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:287: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:287"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262328,7 +263070,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262344,13 +263086,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1625
-#AT_START_1626
-at_fn_group_banner 1626 'vtep-ctl.at:290' \
+#AT_STOP_1628
+#AT_START_1629
+at_fn_group_banner 1629 'vtep-ctl.at:290' \
   "add-ls a, add-ls b" "                             " 105
 at_xfail=no
 (
-  $as_echo "1626. $at_setup_line: testing $at_desc ..."
+  $as_echo "1629. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -262359,7 +263101,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:292: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:292"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262380,7 +263122,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262393,7 +263135,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:292: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:292"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262410,7 +263152,7 @@
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls a
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262422,7 +263164,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:293: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:293"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262439,7 +263181,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262461,7 +263203,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:295"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262476,7 +263218,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:295: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:295"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262493,7 +263235,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262516,7 +263258,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:295"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262530,7 +263272,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:295: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:295"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262547,7 +263289,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262570,7 +263312,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:295"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262582,7 +263324,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:295: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:295"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262599,7 +263341,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262620,7 +263362,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:295"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262632,7 +263374,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:295: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:295"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262649,7 +263391,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262671,7 +263413,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:295"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262683,7 +263425,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:295: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:295"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262700,7 +263442,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262721,7 +263463,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:296: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:296"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262738,7 +263480,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262754,13 +263496,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1626
-#AT_START_1627
-at_fn_group_banner 1627 'vtep-ctl.at:299' \
+#AT_STOP_1629
+#AT_START_1630
+at_fn_group_banner 1630 'vtep-ctl.at:299' \
   "add-ls a, add-ls b, del-ls a" "                   " 105
 at_xfail=no
 (
-  $as_echo "1627. $at_setup_line: testing $at_desc ..."
+  $as_echo "1630. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -262769,7 +263511,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:301: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:301"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262790,7 +263532,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262803,7 +263545,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:301: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:301"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262822,7 +263564,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls b
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket del-ls a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262834,7 +263576,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:302: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:302"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262851,7 +263593,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262873,7 +263615,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:304"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262887,7 +263629,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:304: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:304"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262904,7 +263646,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262927,7 +263669,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:304"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262941,7 +263683,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:304: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:304"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262958,7 +263700,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -262981,7 +263723,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:304"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists b
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -262993,7 +263735,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:304: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:304"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263010,7 +263752,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263032,7 +263774,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:304"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263044,7 +263786,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:304: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:304"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263061,7 +263803,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263082,7 +263824,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:305: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:305"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263099,7 +263841,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263115,13 +263857,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1627
-#AT_START_1628
-at_fn_group_banner 1628 'vtep-ctl.at:308' \
+#AT_STOP_1630
+#AT_START_1631
+at_fn_group_banner 1631 'vtep-ctl.at:308' \
   "add-ls a, del-ls a, add-ls a" "                   " 105
 at_xfail=no
 (
-  $as_echo "1628. $at_setup_line: testing $at_desc ..."
+  $as_echo "1631. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -263130,7 +263872,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:310: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:310"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263151,7 +263893,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263164,7 +263906,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:310: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:310"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263177,7 +263919,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:311: vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline  -- add-ls a -- del-ls a -- add-ls a"
 at_fn_check_prepare_trace "vtep-ctl.at:311"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline  -- add-ls a -- del-ls a -- add-ls a
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263193,7 +263935,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:311: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:311"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263210,7 +263952,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263232,7 +263974,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:318"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263246,7 +263988,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:318: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:318"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263263,7 +264005,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263286,7 +264028,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:318"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263300,7 +264042,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:318: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:318"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263317,7 +264059,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263340,7 +264082,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:318"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists a
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263352,7 +264094,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:318: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:318"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263369,7 +264111,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263391,7 +264133,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:318"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263403,7 +264145,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:318: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:318"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263420,7 +264162,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263441,7 +264183,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:319: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:319"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263458,7 +264200,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263474,13 +264216,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1628
-#AT_START_1629
-at_fn_group_banner 1629 'vtep-ctl.at:326' \
+#AT_STOP_1631
+#AT_START_1632
+at_fn_group_banner 1632 'vtep-ctl.at:326' \
   "bind-ls ps1 pp1 300 ls1" "                        " 106
 at_xfail=no
 (
-  $as_echo "1629. $at_setup_line: testing $at_desc ..."
+  $as_echo "1632. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -263489,7 +264231,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:328: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:328"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263510,7 +264252,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263523,7 +264265,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:328: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:328"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263542,7 +264284,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-port ps1 pp1
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263554,7 +264296,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:329: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:329"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263571,7 +264313,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263593,7 +264335,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:333"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263607,7 +264349,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:333: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:333"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263624,7 +264366,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263647,7 +264389,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:333"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263661,7 +264403,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:333: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:333"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263678,7 +264420,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263701,7 +264443,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:333"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists ps1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263713,7 +264455,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:333: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:333"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263730,7 +264472,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263752,7 +264494,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:333"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263764,7 +264506,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:333: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:333"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263781,7 +264523,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263803,7 +264545,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:334"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ports ps1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263817,7 +264559,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:334: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:334"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263834,7 +264576,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263857,7 +264599,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:334"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ports ps1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263871,7 +264613,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:334: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:334"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263888,7 +264630,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263910,7 +264652,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:335"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263924,7 +264666,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:335: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:335"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263941,7 +264683,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263964,7 +264706,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:335"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -263978,7 +264720,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:335: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:335"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -263995,7 +264737,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264018,7 +264760,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:335"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264030,7 +264772,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:335: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:335"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264047,7 +264789,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264069,7 +264811,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:335"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264081,7 +264823,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:335: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:335"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264098,7 +264840,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264120,7 +264862,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:336"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket bind-ls ps1 pp1 300 ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264132,7 +264874,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:336: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:336"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264149,7 +264891,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264171,7 +264913,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:338"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-bindings ps1 pp1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264185,7 +264927,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:338: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:338"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264202,7 +264944,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264223,7 +264965,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:341: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:341"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264240,7 +264982,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264256,13 +264998,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1629
-#AT_START_1630
-at_fn_group_banner 1630 'vtep-ctl.at:344' \
+#AT_STOP_1632
+#AT_START_1633
+at_fn_group_banner 1633 'vtep-ctl.at:344' \
   "bind-ls ps1 pp1 300 ls1, bind-ls ps1 pp1 400 ls2" "" 106
 at_xfail=no
 (
-  $as_echo "1630. $at_setup_line: testing $at_desc ..."
+  $as_echo "1633. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -264271,7 +265013,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:346: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:346"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264292,7 +265034,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264305,7 +265047,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:346: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:346"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264326,7 +265068,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264338,7 +265080,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:347: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:347"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264355,7 +265097,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264377,7 +265119,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:352"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264391,7 +265133,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:352: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:352"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264408,7 +265150,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264431,7 +265173,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:352"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264445,7 +265187,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:352: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:352"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264462,7 +265204,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264485,7 +265227,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:352"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists ps1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264497,7 +265239,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:352: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:352"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264514,7 +265256,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264536,7 +265278,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:352"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264548,7 +265290,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:352: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:352"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264565,7 +265307,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264587,7 +265329,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:353"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ports ps1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264601,7 +265343,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:353: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:353"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264618,7 +265360,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264641,7 +265383,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:353"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ports ps1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264655,7 +265397,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:353: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:353"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264672,7 +265414,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264694,7 +265436,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:354"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264709,7 +265451,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:354: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:354"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264726,7 +265468,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264749,7 +265491,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:354"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264763,7 +265505,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:354: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:354"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264780,7 +265522,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264803,7 +265545,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:354"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264815,7 +265557,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:354: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:354"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264832,7 +265574,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264853,7 +265595,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:354"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264865,7 +265607,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:354: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:354"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264882,7 +265624,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264904,7 +265646,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:354"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264916,7 +265658,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:354: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:354"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264933,7 +265675,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264955,7 +265697,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:355"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket bind-ls ps1 pp1 300 ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -264967,7 +265709,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:355: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:355"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -264984,7 +265726,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265006,7 +265748,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:357"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket bind-ls ps1 pp1 400 ls2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265018,7 +265760,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:357: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:357"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265035,7 +265777,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265057,7 +265799,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:359"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-bindings ps1 pp1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265072,7 +265814,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:359: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:359"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265089,7 +265831,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265110,7 +265852,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:363: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:363"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265127,7 +265869,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265143,13 +265885,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1630
-#AT_START_1631
-at_fn_group_banner 1631 'vtep-ctl.at:366' \
+#AT_STOP_1633
+#AT_START_1634
+at_fn_group_banner 1634 'vtep-ctl.at:366' \
   "bind-ls ps1 pp1 300, bind-ls ps2 pp2 300 ls2" "   " 106
 at_xfail=no
 (
-  $as_echo "1631. $at_setup_line: testing $at_desc ..."
+  $as_echo "1634. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -265158,7 +265900,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:368: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:368"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265179,7 +265921,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265192,7 +265934,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:368: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:368"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265217,7 +265959,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265229,7 +265971,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:369: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:369"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265246,7 +265988,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265268,7 +266010,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:376"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265283,7 +266025,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:376: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:376"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265300,7 +266042,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265323,7 +266065,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:376"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ps
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265337,7 +266079,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:376: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:376"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265354,7 +266096,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265377,7 +266119,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:376"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists ps1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265389,7 +266131,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:376: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:376"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265406,7 +266148,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265427,7 +266169,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:376"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists ps2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265439,7 +266181,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:376: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:376"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265456,7 +266198,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265478,7 +266220,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:376"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ps-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265490,7 +266232,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:376: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:376"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265507,7 +266249,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265529,7 +266271,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:377"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ports ps1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265543,7 +266285,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:377: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:377"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265560,7 +266302,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265583,7 +266325,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:377"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ports ps1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265597,7 +266339,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:377: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:377"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265614,7 +266356,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265636,7 +266378,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:378"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ports ps2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265650,7 +266392,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:378: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:378"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265667,7 +266409,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265690,7 +266432,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:378"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ports ps2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265704,7 +266446,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:378: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:378"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265721,7 +266463,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265743,7 +266485,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:379"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265758,7 +266500,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:379: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:379"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265775,7 +266517,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265798,7 +266540,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:379"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265812,7 +266554,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:379: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:379"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265829,7 +266571,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265852,7 +266594,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:379"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265864,7 +266606,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:379: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:379"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265881,7 +266623,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265902,7 +266644,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:379"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265914,7 +266656,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:379: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:379"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265931,7 +266673,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265953,7 +266695,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:379"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -265965,7 +266707,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:379: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:379"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -265982,7 +266724,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266004,7 +266746,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:380"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket bind-ls ps1 pp1 300 ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266016,7 +266758,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:380: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:380"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266033,7 +266775,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266055,7 +266797,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:382"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket bind-ls ps2 pp2 300 ls2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266067,7 +266809,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:382: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:382"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266084,7 +266826,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266106,7 +266848,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:384"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-bindings ps1 pp1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266120,7 +266862,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:384: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:384"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266137,7 +266879,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266159,7 +266901,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:387"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-bindings ps2 pp2
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266173,7 +266915,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:387: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:387"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266190,7 +266932,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266211,7 +266953,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:390: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:390"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266228,7 +266970,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266244,13 +266986,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1631
-#AT_START_1632
-at_fn_group_banner 1632 'vtep-ctl.at:397' \
+#AT_STOP_1634
+#AT_START_1635
+at_fn_group_banner 1635 'vtep-ctl.at:397' \
   "add-ucast-local ls1" "                            " 107
 at_xfail=no
 (
-  $as_echo "1632. $at_setup_line: testing $at_desc ..."
+  $as_echo "1635. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -266259,7 +267001,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:399: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:399"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266280,7 +267022,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266293,7 +267035,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:399: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:399"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266308,7 +267050,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:400"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266320,7 +267062,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:400: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:400"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266337,7 +267079,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266359,7 +267101,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:402"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266373,7 +267115,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:402: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:402"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266390,7 +267132,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266413,7 +267155,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:402"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266427,7 +267169,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:402: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:402"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266444,7 +267186,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266467,7 +267209,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:402"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266479,7 +267221,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:402: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:402"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266496,7 +267238,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266518,7 +267260,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:402"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266530,7 +267272,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:402: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:402"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266547,7 +267289,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266573,7 +267315,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ucast-local ls1 00:11:22:33:44:66 vxlan_over_ipv4 10.0.0.11
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266585,7 +267327,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:403: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:403"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266602,7 +267344,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266624,7 +267366,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:407"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266643,7 +267385,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:407: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:407"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266660,7 +267402,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266682,7 +267424,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:415"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266699,7 +267441,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:415: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:415"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266716,7 +267458,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266737,7 +267479,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:421: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:421"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266754,7 +267496,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266770,13 +267512,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1632
-#AT_START_1633
-at_fn_group_banner 1633 'vtep-ctl.at:424' \
+#AT_STOP_1635
+#AT_START_1636
+at_fn_group_banner 1636 'vtep-ctl.at:424' \
   "add-ucast-local ls1, overwrite" "                 " 107
 at_xfail=no
 (
-  $as_echo "1633. $at_setup_line: testing $at_desc ..."
+  $as_echo "1636. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -266785,7 +267527,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:426: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:426"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266806,7 +267548,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266819,7 +267561,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:426: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:426"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266834,7 +267576,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:427"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266846,7 +267588,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:427: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:427"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266863,7 +267605,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266885,7 +267627,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:429"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266899,7 +267641,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:429: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:429"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266916,7 +267658,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266939,7 +267681,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:429"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -266953,7 +267695,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:429: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:429"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266970,7 +267712,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -266993,7 +267735,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:429"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267005,7 +267747,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:429: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:429"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267022,7 +267764,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267044,7 +267786,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:429"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267056,7 +267798,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:429: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:429"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267073,7 +267815,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267099,7 +267841,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ucast-local ls1 00:11:22:33:44:55 10.0.0.11
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267111,7 +267853,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:430: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:430"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267128,7 +267870,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267150,7 +267892,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:434"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267168,7 +267910,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:434: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:434"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267185,7 +267927,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267206,7 +267948,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:441: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:441"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267223,7 +267965,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267239,13 +267981,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1633
-#AT_START_1634
-at_fn_group_banner 1634 'vtep-ctl.at:444' \
+#AT_STOP_1636
+#AT_START_1637
+at_fn_group_banner 1637 'vtep-ctl.at:444' \
   "add-ucast-local ls1, del-ucast-local ls1" "       " 107
 at_xfail=no
 (
-  $as_echo "1634. $at_setup_line: testing $at_desc ..."
+  $as_echo "1637. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -267254,7 +267996,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:446: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:446"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267275,7 +268017,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267288,7 +268030,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:446: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:446"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267303,7 +268045,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:447"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267315,7 +268057,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:447: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:447"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267332,7 +268074,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267354,7 +268096,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:449"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267368,7 +268110,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:449: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:449"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267385,7 +268127,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267408,7 +268150,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:449"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267422,7 +268164,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:449: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:449"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267439,7 +268181,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267462,7 +268204,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:449"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267474,7 +268216,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:449: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:449"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267491,7 +268233,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267513,7 +268255,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:449"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267525,7 +268267,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:449: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:449"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267542,7 +268284,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267568,7 +268310,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ucast-local ls1 00:11:22:33:44:66 vxlan_over_ipv4 10.0.0.11
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267580,7 +268322,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:450: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:450"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267597,7 +268339,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267619,7 +268361,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:454"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267638,7 +268380,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:454: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:454"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267655,7 +268397,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267679,7 +268421,7 @@
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket del-ucast-local ls1 00:11:22:33:44:55
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267691,7 +268433,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:462: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:462"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267708,7 +268450,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267730,7 +268472,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:465"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267748,7 +268490,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:465: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:465"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267765,7 +268507,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267786,7 +268528,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:472: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:472"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267803,7 +268545,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267819,13 +268561,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1634
-#AT_START_1635
-at_fn_group_banner 1635 'vtep-ctl.at:475' \
+#AT_STOP_1637
+#AT_START_1638
+at_fn_group_banner 1638 'vtep-ctl.at:475' \
   "add-ucast-remote ls1" "                           " 107
 at_xfail=no
 (
-  $as_echo "1635. $at_setup_line: testing $at_desc ..."
+  $as_echo "1638. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -267834,7 +268576,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:477: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:477"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267855,7 +268597,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267868,7 +268610,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:477: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:477"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267883,7 +268625,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:478"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267895,7 +268637,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:478: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:478"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267912,7 +268654,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267934,7 +268676,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:480"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -267948,7 +268690,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:480: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:480"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267965,7 +268707,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -267988,7 +268730,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:480"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268002,7 +268744,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:480: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:480"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268019,7 +268761,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268042,7 +268784,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:480"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268054,7 +268796,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:480: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:480"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268071,7 +268813,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268093,7 +268835,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:480"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268105,7 +268847,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:480: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:480"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268122,7 +268864,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268148,7 +268890,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ucast-remote ls1 00:11:22:33:44:66 vxlan_over_ipv4 10.0.0.11
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268160,7 +268902,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:481: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:481"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268177,7 +268919,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268199,7 +268941,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:485"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268218,7 +268960,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:485: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:485"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268235,7 +268977,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268257,7 +268999,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:493"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268274,7 +269016,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:493: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:493"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268291,7 +269033,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268312,7 +269054,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:499: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:499"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268329,7 +269071,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268345,13 +269087,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1635
-#AT_START_1636
-at_fn_group_banner 1636 'vtep-ctl.at:502' \
+#AT_STOP_1638
+#AT_START_1639
+at_fn_group_banner 1639 'vtep-ctl.at:502' \
   "add-ucast-remote ls1, overwrite" "                " 107
 at_xfail=no
 (
-  $as_echo "1636. $at_setup_line: testing $at_desc ..."
+  $as_echo "1639. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -268360,7 +269102,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:504: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:504"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268381,7 +269123,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268394,7 +269136,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:504: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:504"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268409,7 +269151,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:505"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268421,7 +269163,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:505: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:505"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268438,7 +269180,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268460,7 +269202,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:507"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268474,7 +269216,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:507: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:507"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268491,7 +269233,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268514,7 +269256,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:507"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268528,7 +269270,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:507: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:507"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268545,7 +269287,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268568,7 +269310,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:507"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268580,7 +269322,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:507: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:507"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268597,7 +269339,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268619,7 +269361,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:507"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268631,7 +269373,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:507: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:507"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268648,7 +269390,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268674,7 +269416,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ucast-remote ls1 00:11:22:33:44:55 10.0.0.11
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268686,7 +269428,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:508: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:508"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268703,7 +269445,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268725,7 +269467,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:512"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268743,7 +269485,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:512: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:512"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268760,7 +269502,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268781,7 +269523,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:519: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:519"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268798,7 +269540,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268814,13 +269556,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1636
-#AT_START_1637
-at_fn_group_banner 1637 'vtep-ctl.at:522' \
+#AT_STOP_1639
+#AT_START_1640
+at_fn_group_banner 1640 'vtep-ctl.at:522' \
   "add-ucast-remote ls1, del-ucast-remote ls1" "     " 107
 at_xfail=no
 (
-  $as_echo "1637. $at_setup_line: testing $at_desc ..."
+  $as_echo "1640. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -268829,7 +269571,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:524: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:524"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268850,7 +269592,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268863,7 +269605,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:524: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:524"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268878,7 +269620,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:525"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268890,7 +269632,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:525: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:525"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268907,7 +269649,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268929,7 +269671,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:527"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268943,7 +269685,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:527: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:527"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268960,7 +269702,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -268983,7 +269725,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:527"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -268997,7 +269739,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:527: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:527"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269014,7 +269756,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269037,7 +269779,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:527"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269049,7 +269791,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:527: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:527"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269066,7 +269808,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269088,7 +269830,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:527"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269100,7 +269842,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:527: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:527"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269117,7 +269859,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269143,7 +269885,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ucast-remote ls1 00:11:22:33:44:66 vxlan_over_ipv4 10.0.0.11
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269155,7 +269897,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:528: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:528"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269172,7 +269914,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269194,7 +269936,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:532"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269213,7 +269955,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:532: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:532"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269230,7 +269972,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269254,7 +269996,7 @@
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket del-ucast-remote ls1 00:11:22:33:44:55
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269266,7 +270008,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:540: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:540"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269283,7 +270025,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269305,7 +270047,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:543"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269323,7 +270065,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:543: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:543"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269340,7 +270082,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269361,7 +270103,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:550: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:550"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269378,7 +270120,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269394,13 +270136,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1637
-#AT_START_1638
-at_fn_group_banner 1638 'vtep-ctl.at:553' \
+#AT_STOP_1640
+#AT_START_1641
+at_fn_group_banner 1641 'vtep-ctl.at:553' \
   "add-ucast-local ls1, add-ucast-remote ls1" "      " 107
 at_xfail=no
 (
-  $as_echo "1638. $at_setup_line: testing $at_desc ..."
+  $as_echo "1641. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -269409,7 +270151,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:555: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:555"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269430,7 +270172,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269443,7 +270185,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:555: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:555"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269458,7 +270200,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:556"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269470,7 +270212,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:556: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:556"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269487,7 +270229,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269509,7 +270251,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:558"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269523,7 +270265,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:558: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:558"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269540,7 +270282,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269563,7 +270305,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:558"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269577,7 +270319,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:558: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:558"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269594,7 +270336,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269617,7 +270359,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:558"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269629,7 +270371,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:558: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:558"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269646,7 +270388,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269668,7 +270410,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:558"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269680,7 +270422,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:558: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:558"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269697,7 +270439,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269727,7 +270469,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ucast-remote ls1 02:11:22:33:44:66 vxlan_over_ipv4 10.0.0.11
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269739,7 +270481,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:559: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:559"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269756,7 +270498,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269778,7 +270520,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:565"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269797,7 +270539,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:565: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:565"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269814,7 +270556,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269836,7 +270578,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:573"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -269855,7 +270597,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:573: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:573"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269872,7 +270614,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269893,7 +270635,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:581: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:581"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269910,7 +270652,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269926,13 +270668,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1638
-#AT_START_1639
-at_fn_group_banner 1639 'vtep-ctl.at:584' \
+#AT_STOP_1641
+#AT_START_1642
+at_fn_group_banner 1642 'vtep-ctl.at:584' \
   "add-mcast-local ls1" "                            " 107
 at_xfail=no
 (
-  $as_echo "1639. $at_setup_line: testing $at_desc ..."
+  $as_echo "1642. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -269941,7 +270683,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:586: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:586"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269962,7 +270704,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269975,7 +270717,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:586: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:586"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -269990,7 +270732,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:587"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270002,7 +270744,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:587: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:587"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270019,7 +270761,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270041,7 +270783,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:589"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270055,7 +270797,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:589: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:589"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270072,7 +270814,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270095,7 +270837,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:589"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270109,7 +270851,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:589: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:589"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270126,7 +270868,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270149,7 +270891,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:589"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270161,7 +270903,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:589: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:589"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270178,7 +270920,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270200,7 +270942,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:589"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270212,7 +270954,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:589: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:589"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270229,7 +270971,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270257,7 +270999,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-mcast-local ls1 01:11:22:33:44:55 10.0.0.12
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270269,7 +271011,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:590: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:590"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270286,7 +271028,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270308,7 +271050,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:595"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270328,7 +271070,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:595: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:595"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270345,7 +271087,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270367,7 +271109,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:604"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270384,7 +271126,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:604: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:604"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270401,7 +271143,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270422,7 +271164,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:610: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:610"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270439,7 +271181,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270455,13 +271197,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1639
-#AT_START_1640
-at_fn_group_banner 1640 'vtep-ctl.at:613' \
+#AT_STOP_1642
+#AT_START_1643
+at_fn_group_banner 1643 'vtep-ctl.at:613' \
   "add-mcast-local ls1, del-mcast-local ls1" "       " 107
 at_xfail=no
 (
-  $as_echo "1640. $at_setup_line: testing $at_desc ..."
+  $as_echo "1643. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -270470,7 +271212,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:615: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:615"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270491,7 +271233,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270504,7 +271246,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:615: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:615"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270519,7 +271261,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:616"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270531,7 +271273,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:616: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:616"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270548,7 +271290,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270570,7 +271312,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:618"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270584,7 +271326,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:618: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:618"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270601,7 +271343,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270624,7 +271366,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:618"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270638,7 +271380,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:618: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:618"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270655,7 +271397,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270678,7 +271420,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:618"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270690,7 +271432,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:618: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:618"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270707,7 +271449,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270729,7 +271471,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:618"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270741,7 +271483,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:618: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:618"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270758,7 +271500,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270788,7 +271530,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-mcast-local ls1 01:11:22:33:44:55 10.0.0.13
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270800,7 +271542,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:619: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:619"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270817,7 +271559,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270839,7 +271581,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:625"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270860,7 +271602,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:625: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:625"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270877,7 +271619,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270901,7 +271643,7 @@
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket del-mcast-local ls1 01:11:22:33:44:55 10.0.0.12
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270913,7 +271655,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:635: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:635"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270930,7 +271672,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270952,7 +271694,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:638"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -270972,7 +271714,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:638: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:638"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -270989,7 +271731,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271010,7 +271752,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:647: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:647"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271027,7 +271769,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271043,13 +271785,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1640
-#AT_START_1641
-at_fn_group_banner 1641 'vtep-ctl.at:650' \
+#AT_STOP_1643
+#AT_START_1644
+at_fn_group_banner 1644 'vtep-ctl.at:650' \
   "add-mcast-remote ls1" "                           " 107
 at_xfail=no
 (
-  $as_echo "1641. $at_setup_line: testing $at_desc ..."
+  $as_echo "1644. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -271058,7 +271800,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:652: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:652"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271079,7 +271821,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271092,7 +271834,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:652: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:652"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271107,7 +271849,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:653"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271119,7 +271861,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:653: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:653"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271136,7 +271878,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271158,7 +271900,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:655"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271172,7 +271914,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:655: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:655"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271189,7 +271931,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271212,7 +271954,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:655"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271226,7 +271968,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:655: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:655"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271243,7 +271985,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271266,7 +272008,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:655"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271278,7 +272020,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:655: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:655"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271295,7 +272037,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271317,7 +272059,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:655"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271329,7 +272071,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:655: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:655"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271346,7 +272088,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271374,7 +272116,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-mcast-remote ls1 01:11:22:33:44:55 10.0.0.12
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271386,7 +272128,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:656: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:656"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271403,7 +272145,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271425,7 +272167,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:661"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271445,7 +272187,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:661: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:661"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271462,7 +272204,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271484,7 +272226,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:670"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271501,7 +272243,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:670: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:670"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271518,7 +272260,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271539,7 +272281,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:676: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:676"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271556,7 +272298,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271572,13 +272314,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1641
-#AT_START_1642
-at_fn_group_banner 1642 'vtep-ctl.at:679' \
+#AT_STOP_1644
+#AT_START_1645
+at_fn_group_banner 1645 'vtep-ctl.at:679' \
   "add-mcast-remote ls1, del-mcast-remote ls1" "     " 107
 at_xfail=no
 (
-  $as_echo "1642. $at_setup_line: testing $at_desc ..."
+  $as_echo "1645. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -271587,7 +272329,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:681: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:681"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271608,7 +272350,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271621,7 +272363,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:681: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:681"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271636,7 +272378,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:682"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271648,7 +272390,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:682: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:682"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271665,7 +272407,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271687,7 +272429,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:684"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271701,7 +272443,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:684: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:684"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271718,7 +272460,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271741,7 +272483,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:684"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271755,7 +272497,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:684: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:684"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271772,7 +272514,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271795,7 +272537,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:684"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271807,7 +272549,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:684: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:684"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271824,7 +272566,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271846,7 +272588,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:684"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271858,7 +272600,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:684: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:684"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271875,7 +272617,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271905,7 +272647,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-mcast-remote ls1 01:11:22:33:44:55 10.0.0.13
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271917,7 +272659,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:685: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:685"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271934,7 +272676,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271956,7 +272698,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:691"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -271977,7 +272719,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:691: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:691"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -271994,7 +272736,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272018,7 +272760,7 @@
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket del-mcast-remote ls1 01:11:22:33:44:55 10.0.0.12
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272030,7 +272772,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:701: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:701"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272047,7 +272789,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272069,7 +272811,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:704"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272089,7 +272831,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:704: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:704"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272106,7 +272848,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272127,7 +272869,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:713: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:713"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272144,7 +272886,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272160,13 +272902,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1642
-#AT_START_1643
-at_fn_group_banner 1643 'vtep-ctl.at:716' \
+#AT_STOP_1645
+#AT_START_1646
+at_fn_group_banner 1646 'vtep-ctl.at:716' \
   "add-mcast-local ls1, add-mcast-remote ls1" "      " 107
 at_xfail=no
 (
-  $as_echo "1643. $at_setup_line: testing $at_desc ..."
+  $as_echo "1646. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -272175,7 +272917,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:718: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:718"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272196,7 +272938,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272209,7 +272951,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:718: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:718"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272224,7 +272966,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:719"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272236,7 +272978,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:719: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:719"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272253,7 +272995,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272275,7 +273017,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:721"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272289,7 +273031,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:721: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:721"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272306,7 +273048,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272329,7 +273071,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:721"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272343,7 +273085,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:721: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:721"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272360,7 +273102,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272383,7 +273125,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:721"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272395,7 +273137,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:721: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:721"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272412,7 +273154,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272434,7 +273176,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:721"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272446,7 +273188,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:721: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:721"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272463,7 +273205,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272497,7 +273239,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-mcast-remote ls1 03:11:22:33:44:55 10.0.0.12
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272509,7 +273251,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:722: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:722"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272526,7 +273268,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272548,7 +273290,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:730"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272568,7 +273310,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:730: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:730"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272585,7 +273327,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272607,7 +273349,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:739"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272627,7 +273369,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:739: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:739"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272644,7 +273386,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272665,7 +273407,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:748: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:748"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272682,7 +273424,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272698,13 +273440,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1643
-#AT_START_1644
-at_fn_group_banner 1644 'vtep-ctl.at:751' \
+#AT_STOP_1646
+#AT_START_1647
+at_fn_group_banner 1647 'vtep-ctl.at:751' \
   "add local and remote macs, clear-local-macs" "    " 107
 at_xfail=no
 (
-  $as_echo "1644. $at_setup_line: testing $at_desc ..."
+  $as_echo "1647. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -272713,7 +273455,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:753: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:753"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272734,7 +273476,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272747,7 +273489,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:753: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:753"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272762,7 +273504,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:754"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272774,7 +273516,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:754: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:754"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272791,7 +273533,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272813,7 +273555,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:756"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272827,7 +273569,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:756: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:756"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272844,7 +273586,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272867,7 +273609,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:756"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272881,7 +273623,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:756: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:756"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272898,7 +273640,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272921,7 +273663,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:756"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272933,7 +273675,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:756: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:756"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272950,7 +273692,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -272972,7 +273714,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:756"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -272984,7 +273726,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:756: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:756"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273001,7 +273743,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273039,7 +273781,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-mcast-remote ls1 01:11:22:33:44:55 10.0.0.12
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273051,7 +273793,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:757: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:757"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273068,7 +273810,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273090,7 +273832,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:767"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273111,7 +273853,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:767: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:767"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273128,7 +273870,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273150,7 +273892,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:777"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273171,7 +273913,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:777: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:777"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273188,7 +273930,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273210,7 +273952,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:787"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket clear-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273222,7 +273964,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:787: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:787"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273239,7 +273981,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273261,7 +274003,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:789"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273278,7 +274020,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:789: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:789"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273295,7 +274037,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273317,7 +274059,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:795"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273338,7 +274080,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:795: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:795"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273355,7 +274097,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273376,7 +274118,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:805: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:805"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273393,7 +274135,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273409,13 +274151,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1644
-#AT_START_1645
-at_fn_group_banner 1645 'vtep-ctl.at:808' \
+#AT_STOP_1647
+#AT_START_1648
+at_fn_group_banner 1648 'vtep-ctl.at:808' \
   "add local and remote macs, clear-remote-macs" "   " 107
 at_xfail=no
 (
-  $as_echo "1645. $at_setup_line: testing $at_desc ..."
+  $as_echo "1648. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -273424,7 +274166,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:810: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:810"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273445,7 +274187,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273458,7 +274200,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:810: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:810"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273473,7 +274215,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:811"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-ls ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273485,7 +274227,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:811: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:811"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273502,7 +274244,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273524,7 +274266,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:813"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273538,7 +274280,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:813: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:813"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273555,7 +274297,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273578,7 +274320,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:813"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline -- list-ls
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273592,7 +274334,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:813: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:813"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273609,7 +274351,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273632,7 +274374,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:813"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273644,7 +274386,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:813: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:813"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273661,7 +274403,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273683,7 +274425,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:813"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket ls-exists nonexistent
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273695,7 +274437,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:813: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:813"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273712,7 +274454,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273750,7 +274492,7 @@
 vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket add-mcast-remote ls1 01:11:22:33:44:55 10.0.0.12
 
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273762,7 +274504,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:814: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:814"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273779,7 +274521,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273801,7 +274543,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:824"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273822,7 +274564,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:824: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:824"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273839,7 +274581,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273861,7 +274603,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:834"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273882,7 +274624,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:834: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:834"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273899,7 +274641,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273921,7 +274663,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:844"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket clear-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273933,7 +274675,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:844: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:844"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273950,7 +274692,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -273972,7 +274714,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:846"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-local-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -273993,7 +274735,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:846: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:846"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274010,7 +274752,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274032,7 +274774,7 @@
 at_fn_check_prepare_notrace 'an embedded newline' "vtep-ctl.at:856"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket list-remote-macs ls1
 
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -274049,7 +274791,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:856: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:856"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274066,7 +274808,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274087,7 +274829,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:862: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:862"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274104,7 +274846,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274120,13 +274862,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1645
-#AT_START_1646
-at_fn_group_banner 1646 'vtep-ctl.at:868' \
+#AT_STOP_1648
+#AT_START_1649
+at_fn_group_banner 1649 'vtep-ctl.at:868' \
   "managers" "                                       " 108
 at_xfail=no
 (
-  $as_echo "1646. $at_setup_line: testing $at_desc ..."
+  $as_echo "1649. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -274135,7 +274877,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:870: ovsdb-tool create db \$abs_top_srcdir/vtep/vtep.ovsschema"
 at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema" "vtep-ctl.at:870"
 ( $at_check_trace; ovsdb-tool create db $abs_top_srcdir/vtep/vtep.ovsschema
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274156,7 +274898,7 @@
           {"op": "insert",
            "table": "Global",
            "row": {}}]'
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274169,7 +274911,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:870: ovsdb-server --detach --no-chdir --pidfile=\"\`pwd\`\"/pid --remote=punix:socket --unixctl=\"\`pwd\`\"/unixctl db >/dev/null 2>&1"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:870"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274182,7 +274924,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:871: vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline  -- del-manager -- get-manager -- set-manager tcp:4.5.6.7 -- get-manager -- set-manager tcp:8.9.10.11 tcp:5.4.3.2 -- get-manager -- del-manager -- get-manager"
 at_fn_check_prepare_trace "vtep-ctl.at:871"
 ( $at_check_trace; vtep-ctl --timeout=5 -vreconnect:emer --db=unix:socket --oneline  -- del-manager -- get-manager -- set-manager tcp:4.5.6.7 -- get-manager -- set-manager tcp:8.9.10.11 tcp:5.4.3.2 -- get-manager -- del-manager -- get-manager
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
@@ -274203,7 +274945,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:871: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:871"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274220,7 +274962,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274241,7 +274983,7 @@
 $as_echo "$at_srcdir/vtep-ctl.at:888: ovs-appctl -t \"\`pwd\`\"/unixctl -e exit"
 at_fn_check_prepare_notrace 'a `...` command substitution' "vtep-ctl.at:888"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/unixctl -e exit
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274258,7 +275000,7 @@
 ( $at_check_trace; ovs_wait_cond () { if kill -0 `cat savepid`; then return 1; else return 0; fi
 }
 ovs_wait
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274274,13 +275016,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1646
-#AT_START_1647
-at_fn_group_banner 1647 'auto-attach.at:3' \
+#AT_STOP_1649
+#AT_START_1650
+at_fn_group_banner 1650 'auto-attach.at:3' \
   "auto-attach - packet tests" "                     " 109
 at_xfail=no
 (
-  $as_echo "1647. $at_setup_line: testing $at_desc ..."
+  $as_echo "1650. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -274288,7 +275030,7 @@
 $as_echo "$at_srcdir/auto-attach.at:5: ovstest test-aa"
 at_fn_check_prepare_trace "auto-attach.at:5"
 ( $at_check_trace; ovstest test-aa
-) >>"$at_stdout" 2>>"$at_stderr"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
@@ -274302,4 +275044,4 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1647
+#AT_STOP_1650
diff -Nru openvswitch-2.4.0/tests/tunnel-push-pop.at openvswitch-2.4.1/tests/tunnel-push-pop.at
--- openvswitch-2.4.0/tests/tunnel-push-pop.at	2015-08-21 00:18:22.230479256 +0000
+++ openvswitch-2.4.1/tests/tunnel-push-pop.at	2016-03-22 13:09:54.478617231 +0000
@@ -74,28 +74,28 @@
 AT_CHECK([ovs-ofctl add-flow int-br action=2])
 AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
-  [Datapath actions: tnl_push(tnl_port(4789),header(size=50,type=4,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=4789,csum=0x0),vxlan(flags=0x8000000,vni=0x7b)),out_port(100))
+  [Datapath actions: tnl_push(tnl_port(4789),header(size=50,type=4,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=4789,csum=0x0),vxlan(flags=0x8000000,vni=0x7b)),out_port(100))
 ])
 
 dnl Check VXLAN tunnel push set tunnel id by flow and checksum
 AT_CHECK([ovs-ofctl add-flow int-br "actions=set_tunnel:124,4"])
 AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
-  [Datapath actions: tnl_push(tnl_port(4789),header(size=50,type=4,eth(dst=f8:bc:12:44:34:b7,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.93,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=4789,csum=0xffff),vxlan(flags=0x8000000,vni=0x7c)),out_port(100))
+  [Datapath actions: tnl_push(tnl_port(4789),header(size=50,type=4,eth(dst=f8:bc:12:44:34:b7,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.93,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=4789,csum=0xffff),vxlan(flags=0x8000000,vni=0x7c)),out_port(100))
 ])
 
 dnl Check GRE tunnel push
 AT_CHECK([ovs-ofctl add-flow int-br action=3])
 AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
-  [Datapath actions: tnl_push(tnl_port(3),header(size=42,type=3,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=47,tos=0,ttl=64,frag=0x40),gre((flags=0x2000,proto=0x6558),key=0x1c8)),out_port(100))
+  [Datapath actions: tnl_push(tnl_port(3),header(size=42,type=3,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=47,tos=0,ttl=64,frag=0x4000),gre((flags=0x2000,proto=0x6558),key=0x1c8)),out_port(100))
 ])
 
 dnl Check Geneve tunnel push
 AT_CHECK([ovs-ofctl add-flow int-br "actions=set_field:1.1.2.92->tun_dst,5"])
 AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
-  [Datapath actions: tnl_push(tnl_port(6081),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=6081,csum=0x0),geneve(vni=0x7b)),out_port(100))
+  [Datapath actions: tnl_push(tnl_port(6081),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=6081,csum=0x0),geneve(vni=0x7b)),out_port(100))
 ])
 
 dnl Check decapsulation of GRE packet
diff -Nru openvswitch-2.4.0/.travis/prepare.sh openvswitch-2.4.1/.travis/prepare.sh
--- openvswitch-2.4.0/.travis/prepare.sh	2015-08-11 20:38:17.279287075 +0000
+++ openvswitch-2.4.1/.travis/prepare.sh	2016-03-22 13:09:54.382614864 +0000
@@ -1,11 +1,4 @@
 #!/bin/bash
 
-sudo -E apt-get update -qq
-sudo -E apt-get install -qq libssl-dev llvm-dev
-sudo -E apt-get install -qq gcc-multilib
-if [ "$DPDK" ]; then
-    sudo -E apt-get install -qq libfuse-dev
-fi
-
 git clone git://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse.git
-cd sparse && make && sudo -E make install PREFIX=/usr && cd ..
+cd sparse && make && make install && cd ..
diff -Nru openvswitch-2.4.0/.travis.yml openvswitch-2.4.1/.travis.yml
--- openvswitch-2.4.0/.travis.yml	2015-08-21 00:18:20.842479290 +0000
+++ openvswitch-2.4.1/.travis.yml	2016-03-22 13:09:54.382614864 +0000
@@ -3,8 +3,20 @@
   - gcc
   - clang
 
+addons:
+  apt:
+    packages:
+      - libssl-dev
+      - llvm-dev
+      - gcc-multilib
+      - libfuse-dev
+
 before_install: ./.travis/prepare.sh
 
+before_script: export PATH=$PATH:$HOME/bin
+
+sudo: false
+
 env:
   - OPTS="--disable-ssl"
   - TESTSUITE=1 KERNEL=3.18.1
@@ -13,7 +25,7 @@
   - KERNEL=4.0.2
   - KERNEL=3.17.7 DPDK=1
   - KERNEL=3.17.7 DPDK=1 OPTS="--enable-shared"
-  - KERNEL=3.17.7
+  - KERNEL=3.18.21
   - KERNEL=3.16.7
   - KERNEL=3.14.27
   - KERNEL=3.12.35
@@ -26,4 +38,4 @@
 notifications:
   email:
     recipients:
-      - secure: KnZ6yDXDcC4VoiI04ZYR4sRTln7q16aXA7gVBa/M1jPWxl3BiTi+4idVE5bgrB1AK5iUwUXN6LQpjOdFDw1U/D+sKt+xmVG5MyLaTYIFp1TUOgtSGeiG3IUhpu125PN1i2EhXNqANyWyStCiISDvJkDe4D/tbBehip1AEBuQONk=
+      - build@openvswitch.org
diff -Nru openvswitch-2.4.0/utilities/ovs-benchmark.c openvswitch-2.4.1/utilities/ovs-benchmark.c
--- openvswitch-2.4.0/utilities/ovs-benchmark.c	2015-08-11 20:38:18.083315911 +0000
+++ openvswitch-2.4.1/utilities/ovs-benchmark.c	2016-03-22 13:09:54.478617231 +0000
@@ -399,7 +399,7 @@
         long long int now;
         long long int may_open;
         int delay;
-        int error;
+        int retval;
         int j;
 
         if (max_rate > 0) {
@@ -458,8 +458,8 @@
             delay = 1000;
         }
 
-        error = do_poll(fds, n_fds, delay);
-        if (error) {
+        retval = do_poll(fds, n_fds, delay);
+        if (retval < 0) {
             ovs_fatal(errno, "poll");
         }
 
@@ -587,10 +587,10 @@
         }
 
         while (n_fds > 0) {
-            int error;
+            int retval;
 
-            error = do_poll(fds, n_fds, -1);
-            if (error) {
+            retval = do_poll(fds, n_fds, -1);
+            if (retval < 0) {
                 ovs_fatal(errno, "poll");
             }
 
diff -Nru openvswitch-2.4.0/utilities/ovs-ctl.in openvswitch-2.4.1/utilities/ovs-ctl.in
--- openvswitch-2.4.0/utilities/ovs-ctl.in	2015-08-11 20:38:18.083315911 +0000
+++ openvswitch-2.4.1/utilities/ovs-ctl.in	2016-03-22 13:09:54.482617330 +0000
@@ -322,6 +322,12 @@
     esac
 }
 
+save_flows_if_required () {
+    if test X"$DELETE_BRIDGES" != Xyes; then
+        action "Saving flows" ovs_save save-flows "${script_flows}"
+    fi
+}
+
 save_interfaces () {
     "$datadir/scripts/ovs-save" save-interfaces ${ifaces} \
         > "${script_interfaces}"
@@ -372,9 +378,7 @@
     action "Detected internal interfaces: $ifaces" true
 
     init_restore_scripts
-
-    action "Saving flows" ovs_save save-flows "${script_flows}"
-
+    save_flows_if_required
     save_ofports_if_required
 
     # Restart the database first, since a large database may take a
@@ -450,7 +454,7 @@
     if daemon_is_running ovsdb-server && daemon_is_running ovs-vswitchd; then
         init_restore_scripts
         save_interfaces_if_required
-        action "Saving flows" ovs_save save-flows "${script_flows}"
+        save_flows_if_required
         save_ofports_if_required
     fi
 
diff -Nru openvswitch-2.4.0/utilities/ovs-ofctl.8.in openvswitch-2.4.1/utilities/ovs-ofctl.8.in
--- openvswitch-2.4.0/utilities/ovs-ofctl.8.in	2015-08-21 00:18:22.278479254 +0000
+++ openvswitch-2.4.1/utilities/ovs-ofctl.8.in	2016-03-22 13:09:54.482617330 +0000
@@ -2266,6 +2266,9 @@
 \fBmod\-group\fR commands on groups of type \fBselect\fR. Prohibited
 otherwise. The default value is the empty string.
 .IP
+Other than the empty string, \fBhash\fR is currently the only defined
+selection method.
+.IP
 This option will use a Netronome OpenFlow extension which is only supported
 when using Open vSwitch 2.4 and later with OpenFlow 1.5 and later.
 
@@ -2279,7 +2282,8 @@
 This option will use a Netronome OpenFlow extension which is only supported
 when using Open vSwitch 2.4 and later with OpenFlow 1.5 and later.
 
-.IP \fBfields\fR=\fIparam\fR
+.IP \fBfields\fR=\fIfield\fR
+.IQ \fBfields(\fIfield\fR[\fB=\fImask\fR]\fR...\fB)\fR
 The field parameters to selection method selected by the
 \fBselection_method\fR field.  The syntax is described in \fBFlow Syntax\fR
 with the additional restrictions that if a value is provided it is
diff -Nru openvswitch-2.4.0/utilities/ovs-vsctl.c openvswitch-2.4.1/utilities/ovs-vsctl.c
--- openvswitch-2.4.0/utilities/ovs-vsctl.c	2015-08-21 00:18:22.334479253 +0000
+++ openvswitch-2.4.1/utilities/ovs-vsctl.c	2016-03-22 13:09:54.486617430 +0000
@@ -297,6 +297,7 @@
         OPT_NO_SYSLOG,
         OPT_NO_WAIT,
         OPT_DRY_RUN,
+        OPT_BOOTSTRAP_CA_CERT,
         OPT_PEER_CA_CERT,
         OPT_LOCAL,
         OPT_RETRY,
@@ -320,6 +321,7 @@
         VLOG_LONG_OPTIONS,
         TABLE_LONG_OPTIONS,
         STREAM_SSL_LONG_OPTIONS,
+        {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
         {"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
         {NULL, 0, NULL, 0},
     };
@@ -462,6 +464,10 @@
             stream_ssl_set_peer_ca_cert_file(optarg);
             break;
 
+        case OPT_BOOTSTRAP_CA_CERT:
+            stream_ssl_set_ca_cert_file(optarg, true);
+            break;
+
         case '?':
             exit(EXIT_FAILURE);
 
diff -Nru openvswitch-2.4.0/vswitchd/bridge.c openvswitch-2.4.1/vswitchd/bridge.c
--- openvswitch-2.4.0/vswitchd/bridge.c	2015-08-21 00:18:22.362479252 +0000
+++ openvswitch-2.4.1/vswitchd/bridge.c	2016-03-22 13:09:54.486617430 +0000
@@ -1671,6 +1671,7 @@
 add_del_bridges(const struct ovsrec_open_vswitch *cfg)
 {
     struct bridge *br, *next;
+    struct shash_node *node;
     struct shash new_br;
     size_t i;
 
@@ -1701,8 +1702,8 @@
     }
 
     /* Add new bridges. */
-    for (i = 0; i < cfg->n_bridges; i++) {
-        const struct ovsrec_bridge *br_cfg = cfg->bridges[i];
+    SHASH_FOR_EACH(node, &new_br) {
+        const struct ovsrec_bridge *br_cfg = node->data;
         struct bridge *br = bridge_lookup(br_cfg->name);
         if (!br) {
             bridge_create(br_cfg);
@@ -3099,6 +3100,7 @@
     struct iface *iface;
     const char *type;
     struct smap_node *node;
+    int error;
 
     iface = iface_find(argv[1]);
     if (!iface) {
@@ -3106,28 +3108,33 @@
         return;
     }
 
-    netdev_get_qos(iface->netdev, &type, &smap);
+    error = netdev_get_qos(iface->netdev, &type, &smap);
+    if (!error) {
+        if (*type != '\0') {
+            struct netdev_queue_dump dump;
+            struct smap details;
+            unsigned int queue_id;
 
-    if (*type != '\0') {
-        struct netdev_queue_dump dump;
-        struct smap details;
-        unsigned int queue_id;
+            ds_put_format(&ds, "QoS: %s %s\n", iface->name, type);
 
-        ds_put_format(&ds, "QoS: %s %s\n", iface->name, type);
+            SMAP_FOR_EACH (node, &smap) {
+                ds_put_format(&ds, "%s: %s\n", node->key, node->value);
+            }
 
-        SMAP_FOR_EACH (node, &smap) {
-            ds_put_format(&ds, "%s: %s\n", node->key, node->value);
-        }
+            smap_init(&details);
+            NETDEV_QUEUE_FOR_EACH (&queue_id, &details, &dump, iface->netdev) {
+                qos_unixctl_show_queue(queue_id, &details, iface, &ds);
+            }
+            smap_destroy(&details);
 
-        smap_init(&details);
-        NETDEV_QUEUE_FOR_EACH (&queue_id, &details, &dump, iface->netdev) {
-            qos_unixctl_show_queue(queue_id, &details, iface, &ds);
+            unixctl_command_reply(conn, ds_cstr(&ds));
+        } else {
+            ds_put_format(&ds, "QoS not configured on %s\n", iface->name);
+            unixctl_command_reply_error(conn, ds_cstr(&ds));
         }
-        smap_destroy(&details);
-
-        unixctl_command_reply(conn, ds_cstr(&ds));
     } else {
-        ds_put_format(&ds, "QoS not configured on %s\n", iface->name);
+        ds_put_format(&ds, "%s: failed to retrieve QOS configuration (%s)\n",
+                      iface->name, ovs_strerror(error));
         unixctl_command_reply_error(conn, ds_cstr(&ds));
     }
 
diff -Nru openvswitch-2.4.0/vtep/ovs-vtep openvswitch-2.4.1/vtep/ovs-vtep
--- openvswitch-2.4.0/vtep/ovs-vtep	2015-08-11 20:38:18.135317777 +0000
+++ openvswitch-2.4.1/vtep/ovs-vtep	2016-03-22 13:09:54.486617430 +0000
@@ -531,8 +531,8 @@
                   % (ps_name, port_no, vlan_))
         ovs_ofctl("del-flows %s in_port=%s" % (ps_name, patch_no))
     else:
-        ovs_ofctl("del-flows %s in_port=%s" % (ps_name, port_no))
-        ovs_ofctl("del-flows %s in_port=%s" % (ps_name, patch_no))
+        ovs_ofctl("--strict del-flows %s in_port=%s" % (ps_name, port_no))
+        ovs_ofctl("--strict del-flows %s in_port=%s" % (ps_name, patch_no))
 
     ls.del_lbinding(lbinding)
 
diff -Nru openvswitch-2.4.0/vtep/README.ovs-vtep.md openvswitch-2.4.1/vtep/README.ovs-vtep.md
--- openvswitch-2.4.0/vtep/README.ovs-vtep.md	2015-08-11 20:38:18.131317633 +0000
+++ openvswitch-2.4.1/vtep/README.ovs-vtep.md	2016-03-22 13:09:54.486617430 +0000
@@ -173,6 +173,7 @@
       ```
 
 4. Direct unicast destinations out a different tunnel:
+
       ```
 vtep-ctl add-ucast-remote ls0 00:11:22:33:44:55 10.2.2.3
       ```
diff -Nru openvswitch-2.4.0/xenserver/openvswitch-xen.spec openvswitch-2.4.1/xenserver/openvswitch-xen.spec
--- openvswitch-2.4.0/xenserver/openvswitch-xen.spec	2015-08-21 17:02:38.997245618 +0000
+++ openvswitch-2.4.1/xenserver/openvswitch-xen.spec	2016-03-22 13:11:22.000766853 +0000
@@ -32,7 +32,7 @@
 # rpmbuild -bb --without check xenserver/openvswitch-xen.spec
 
 %if %{?openvswitch_version:0}%{!?openvswitch_version:1}
-%define openvswitch_version 2.4.0
+%define openvswitch_version 2.4.1
 %endif
 
 %if %{?kernel_uname:1}%{!?kernel_uname:0}